Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efb80cc2 authored by Andreas Gampe's avatar Andreas Gampe Committed by android-build-merger
Browse files

Merge "ActivityManager: Allow DiskRead for wrap.sh determination" am: cbcb388d am: 9f6dc54c

am: 513ef1d4

Change-Id: I4b341ccad2f2e8b6eb03ebac99dd6b2503933649
parents a4b69d34 513ef1d4
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -3929,9 +3929,14 @@ public class ActivityManagerService extends IActivityManager.Stub
            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";
                StrictMode.ThreadPolicy oldPolicy = StrictMode.allowThreadDiskReads();
                try {
                    if (new File(wrapperFileName).exists()) {
                        invokeWith = "/system/bin/logwrapper " + wrapperFileName;
                    }
                } finally {
                    StrictMode.setThreadPolicy(oldPolicy);
                }
            }
            String requiredAbi = (abiOverride != null) ? abiOverride : app.info.primaryCpuAbi;