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

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

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

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

Change-Id: I31fc16291813bab2c8b83cfee0bb21801b49dfe2
parents febeda7c efb80cc2

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

+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;