Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-03-28 23:17:58 +00:00
committed by Android (Google) Code Review
parent 5c5bf24033 99ca99ec3a
commit f7d650e89a
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/am/ActivityManagerService.java
View File

@@ -3929,9 +3929,14 @@ public class ActivityManagerService extends IActivityManager.Stub
if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) { if ((app.info.flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0) {
// Debuggable apps may include a wrapper script with their library directory. // Debuggable apps may include a wrapper script with their library directory.
String wrapperFileName = app.info.nativeLibraryDir + "/wrap.sh"; String wrapperFileName = app.info.nativeLibraryDir + "/wrap.sh";
StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
try {
if (new File(wrapperFileName).exists()) { if (new File(wrapperFileName).exists()) {
invokeWith = "/system/bin/logwrapper " + wrapperFileName; invokeWith = "/system/bin/logwrapper " + wrapperFileName;
} }
} finally {
StrictMode.setThreadPolicy(oldPolicy);
}
} }
String requiredAbi = (abiOverride != null) ? abiOverride : app.info.primaryCpuAbi; String requiredAbi = (abiOverride != null) ? abiOverride : app.info.primaryCpuAbi;