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

Commit df1f806c authored by Tim Van Patten's avatar Tim Van Patten Committed by Android (Google) Code Review
Browse files

Merge "Enhance Logging When Skipping Loading Temp Rules"

parents 184af56d 3df6643a
Loading
Loading
Loading
Loading
+12 −3
Original line number Diff line number Diff line
@@ -306,9 +306,18 @@ public class GraphicsEnvironment {
                                                String packageName,
                                                String paths,
                                                String devOptIn) {
        // Check for temporary rules if debuggable or root
        if (!isDebuggable(context) && !(getCanLoadSystemLibraries() == 1)) {
            Log.v(TAG, "Skipping loading temporary rules file");
        /**
         * We only want to load a temp rules file for:
         *  - apps that are marked 'debuggable' in their manifest
         *  - devices that are running a userdebug build (ro.debuggable) or can inject libraries for
         *    debugging (PR_SET_DUMPABLE).
         */
        boolean appIsDebuggable = isDebuggable(context);
        boolean deviceIsDebuggable = getCanLoadSystemLibraries() == 1;
        if (!(appIsDebuggable || deviceIsDebuggable)) {
            Log.v(TAG, "Skipping loading temporary rules file: "
                    + "appIsDebuggable = " + appIsDebuggable + ", "
                    + "adbRootEnabled = " + deviceIsDebuggable);
            return false;
        }