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

Commit 513ef1d4 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

Change-Id: Iaf7619a5161ce336316e9fcd395eabe368ad7302
parents 855f9f57 9f6dc54c
Loading
Loading
Loading
Loading
+7 −2
Original line number Diff line number Diff line
@@ -3791,9 +3791,14 @@ public final class ActivityManagerService extends ActivityManagerNative
            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;