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

Commit 8b581721 authored by Peiyong Lin's avatar Peiyong Lin
Browse files

Revert "Add 2 ANGLE deferlist settings" 

This reverts commit ef6fa3f9.

Reason for revert: Remove deferred list functionality now that the shape
of ANGLE shipping form is binaries. Applications on the list are broken
with ANGLE due to the lack of YUV support, this is currently being
worked on.

Bug: 280450222
Test: atest CtsAngleIntegrationHostTestCases
Change-Id: Iec8a0fec238fea2cdd43b8988a8abdc997a9d726
parent f88472e1

core/java/android/provider/Settings.java

+0 −12
Original line number Diff line number Diff line
@@ -15309,18 +15309,6 @@ public final class Settings { 
        @Readable

        public static final String ANGLE_EGL_FEATURES = "angle_egl_features";













        /**













         * Comma-separated list of package names that ANGLE may have issues with













         * @hide













         */













        public static final String ANGLE_DEFERLIST = "angle_deferlist";

























        /**













         * Integer mode of the logic for applying `angle_deferlist`













         * @hide













         */













        public static final String ANGLE_DEFERLIST_MODE = "angle_deferlist_mode";



























        /**















         * Show the "ANGLE In Use" dialog box to the user when ANGLE is the OpenGL driver.















         * The value is a boolean (1 or 0).

























core/proto/android/providers/settings/global.proto



+0
−4






























Original line number
Diff line number
Diff line








@@ -471,10 +471,6 @@ message GlobalSettingsProto {













        optional SettingProto updatable_driver_prerelease_opt_in_apps = 18;































        optional SettingProto angle_egl_features = 19;













        // ANGLE - List of Apps that ANGLE may have issues with













        optional SettingProto angle_deferlist = 20;













        // ANGLE - Integer mode of the logic for applying `angle_deferlist`













        optional SettingProto angle_deferlist_mode = 21;















    }















    optional Gpu gpu = 59;

















































packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java



+0
−6






























Original line number
Diff line number
Diff line








@@ -784,12 +784,6 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.ANGLE_EGL_FEATURES,















                GlobalSettingsProto.Gpu.ANGLE_EGL_FEATURES);













        dumpSetting(s, p,













                Settings.Global.ANGLE_DEFERLIST,













                GlobalSettingsProto.Gpu.ANGLE_DEFERLIST);













        dumpSetting(s, p,













                Settings.Global.ANGLE_DEFERLIST_MODE,













                GlobalSettingsProto.Gpu.ANGLE_DEFERLIST_MODE);















        dumpSetting(s, p,















                Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX,















                GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG);

































packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java



+0
−2






























Original line number
Diff line number
Diff line








@@ -518,8 +518,6 @@ public class SettingsBackupTest {













                    Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS,















                    Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES,















                    Settings.Global.ANGLE_EGL_FEATURES,













                    Settings.Global.ANGLE_DEFERLIST,













                    Settings.Global.ANGLE_DEFERLIST_MODE,















                    Settings.Global.UPDATABLE_DRIVER_ALL_APPS,















                    Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS,















                    Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,