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

Commit c3174593 authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Revert "Enable ANGLE-for-Android rule processing again" 

This reverts commit e674a540.

Reason for revert: b/122509524 Random bluetooth crash observed in QP1A.190108.001

Change-Id: I089e30665edf70275d4190bac0577329b4f016a9
parent e674a540

core/java/android/os/GraphicsEnvironment.java

+26 −0
Original line number Diff line number Diff line
@@ -352,6 +352,26 @@ public class GraphicsEnvironment { 
        return false;

    }



    /**

     * Attempt to setup ANGLE with a (temporary) default rules file: b/121153494

     * True: Rules file was loaded.

     * False: Rules file was *not* loaded.

     */

    private boolean setupAngleRulesDebug(String packageName, String paths, String devOptIn) {

        // b/121153494

        // Skip APK rules file checking.

        if (!DEBUG) {

            Log.v(TAG, "Skipping loading the rules file.");

            // Fill in some default values for now, so the loader can get an answer when it asks.

            // Most importantly, we need to indicate which app we are init'ing and what the

            // developer options for it are so we can turn on ANGLE if needed.

            setAngleInfo(paths, packageName, devOptIn, null, 0, 0);

            return true;

        }



        return false;

    }



    /**

     * Attempt to setup ANGLE with a rules file loaded from the ANGLE APK.

     * True: APK rules file was loaded.
@@ -430,6 +450,12 @@ public class GraphicsEnvironment { 
            return;

        }



        // b/121153494

        if (setupAngleRulesDebug(packageName, paths, devOptIn)) {

            // We setup ANGLE with defaults, so we're done here.

            return;

        }



        if (setupAngleRulesApk(anglePkgName, angleInfo, context, packageName, paths, devOptIn)) {

            // We setup ANGLE with rules from the APK, so we're done here.

            return;