Merge "Make sure StrictMode allows disk reads when calling isThreadInProcess." into nyc-mr1-dev

core/java/android/os/Process.java

@@ -1263,6 +1263,7 @@ public class Process {
      * @hide
      */
     public static final boolean isThreadInProcess(int tid, int pid) {
+        StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
         try {
             if (Os.access("/proc/" + tid + "/task/" + pid, OsConstants.F_OK)) {
                 return true;
@@ -1271,6 +1272,9 @@ public class Process {
             }
         } catch (Exception e) {
             return false;
+        } finally {
+            StrictMode.setThreadPolicy(oldPolicy);
         }
+
     }
 }