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

Commit 3df6643a authored by Tim Van Patten's avatar Tim Van Patten
Browse files

Enhance Logging When Skipping Loading Temp Rules 

We only want to load a temporary rules file for processing if the
current app is debuggable or if adb is running as root.   The logic to
do this is a bit less than straightforward to read and we don't
currently log the values to help make it clearer (though we know they were
both 'false' to return early).   This change helps make the code a bit
easier to read and adds some logging that helps make reading the logs a
little easier too.

Bug: 122612037
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: I38baf02ebdb847f9423a80a1093385903eda1686
parent 559e3426

core/java/android/os/GraphicsEnvironment.java

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

        }