commit f7d650e89ab1ce779dc19287edc77359dc309b5b
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Mar 28 23:17:58 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 28 23:18:02 2017 +0000
tree 29d2bbecd0e0fd6a876027372bfda51eab2845f2
parent 5c5bf240335cab81300dde3f1077d7a4c69b87c8
parent 99ca99ec3aab73d772291006af51d377df7a5df0

Merge "ActivityManager: Allow DiskRead for wrap.sh determination" into oc-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index ce9a904..ead1b26 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -3929,8 +3929,13 @@
             if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
                 // Debuggable apps may include a wrapper script with their library directory.
                 String wrapperFileName = app.info.nativeLibraryDir + "/wrap.sh";
-                if (new File(wrapperFileName).exists()) {
-                    invokeWith = "/system/bin/logwrapper " + wrapperFileName;
+                StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
+                try {
+                    if (new File(wrapperFileName).exists()) {
+                        invokeWith = "/system/bin/logwrapper " + wrapperFileName;
+                    }
+                } finally {
+                    StrictMode.setThreadPolicy(oldPolicy);
                 }
             }