[bug] Fix FD info error in java crash tombstone.

When API level is greater than or equal to 21, use android.system.Os.readlink() instead of java.io.File#getCanonicalPath().
iqiyi · Dec 19, 2019 · 9ce3a1b · 9ce3a1b
1 parent 9c94c54
commit 9ce3a1b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Util.java b/src/java/xcrash/xcrash_lib/src/main/java/xcrash/Util.java
@@ -26,6 +26,7 @@
 import android.content.Context;
 import android.os.Build;
 import android.os.Debug;
+import android.system.Os;
 import android.text.TextUtils;
 
 import java.io.BufferedReader;
@@ -363,11 +364,15 @@ public boolean accept(File dir, String name) {
                 for (File fd : fds) {
                     String path = null;
                     try {
-                        path = fd.getCanonicalPath();
+                        if (Build.VERSION.SDK_INT >= 21) {
+                            path = Os.readlink(fd.getAbsolutePath());
+                        } else {
+                            path = fd.getCanonicalPath();
+                        }
                     } catch (Exception ignored) {
                     }
                     sb.append("    fd ").append(fd.getName()).append(": ")
-                        .append(TextUtils.isEmpty(path) ? "???" : path).append('\n');
+                        .append(TextUtils.isEmpty(path) ? "???" : path.trim()).append('\n');
 
                     count++;
                     if (count > 1024) {