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

Commit 8d7604a4 authored by Peiyong Lin's avatar Peiyong Lin Committed by Automerger Merge Worker
Browse files

Merge "Use more inclusive terms." into rvc-dev-plus-aosp am: 094c85c9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12272621

Change-Id: I4caee590c4fdd4f0d595ae091332555dff3654a8
parents eac0d110 094c85c9

core/java/android/os/GraphicsEnvironment.java

+1 −1
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ public class GraphicsEnvironment { 
        final ContentResolver contentResolver = context.getContentResolver();

        final List<String> angleAllowlist =

                getGlobalSettingsString(contentResolver, bundle,

                    Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST);

                    Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST);



        if (DEBUG) Log.v(TAG, "ANGLE allowlist: " + angleAllowlist);

core/java/android/provider/Settings.java

+2 −2
Original line number Diff line number Diff line
@@ -12268,8 +12268,8 @@ public final class Settings { 
         * List of package names that should check ANGLE rules

         * @hide

         */

        public static final String GLOBAL_SETTINGS_ANGLE_WHITELIST =

                "angle_whitelist";

        public static final String GLOBAL_SETTINGS_ANGLE_ALLOWLIST =

                "angle_allowlist";















        /**















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

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -449,7 +449,7 @@ message GlobalSettingsProto {













        // Game Driver - List of Apps that are allowed to use Game Driver















        optional SettingProto game_driver_allowlist = 12;















        // ANGLE - List of Apps that can check ANGLE rules













        optional SettingProto angle_whitelist = 13;













        optional SettingProto angle_allowlist = 13;















        // Game Driver - List of denylists, each denylist is a denylist for















        // a specific Game Driver version















        optional SettingProto game_driver_denylists = 14;

































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



+2
−2




























Original line number
Diff line number
Diff line








@@ -761,8 +761,8 @@ class SettingsProtoDumpUtil {













                Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,















                GlobalSettingsProto.Gpu.ANGLE_GL_DRIVER_SELECTION_VALUES);















        dumpSetting(s, p,













                Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST,













                GlobalSettingsProto.Gpu.ANGLE_WHITELIST);













                Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST,













                GlobalSettingsProto.Gpu.ANGLE_ALLOWLIST);















        dumpSetting(s, p,















                Settings.Global.GLOBAL_SETTINGS_SHOW_ANGLE_IN_USE_DIALOG_BOX,















                GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG);

































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



+1
−1




























Original line number
Diff line number
Diff line








@@ -502,7 +502,7 @@ public class SettingsBackupTest {













                    Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE,















                    Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS,















                    Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,













                    Settings.Global.GLOBAL_SETTINGS_ANGLE_WHITELIST,













                    Settings.Global.GLOBAL_SETTINGS_ANGLE_ALLOWLIST,















                    Settings.Global.GAME_DRIVER_ALL_APPS,















                    Settings.Global.GAME_DRIVER_OPT_IN_APPS,















                    Settings.Global.GAME_DRIVER_PRERELEASE_OPT_IN_APPS,