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

Commit 79c5356a authored by Yiwei Zhang's avatar Yiwei Zhang
Browse files

GUP: Add a global property for genreal preference 

This change also fixes typos and adds some missing comments

Bug: 119221883
Test: Build, flash and boot, verify with prototype
Change-Id: Ida976c4fb3d4af5ffc1d9b977f00fa9c7239a434
Merged-In: Ida976c4fb3d4af5ffc1d9b977f00fa9c7239a434
parent a35e865b

core/java/android/os/GraphicsEnvironment.java

+24 −9
Original line number Diff line number Diff line
@@ -170,6 +170,20 @@ public class GraphicsEnvironment { 
            return;

        }



        // GUP_DEV_ALL_APPS

        // 0: Default (Invalid values fallback to default as well)

        // 1: All apps use Game Update Package

        // 2: All apps use system graphics driver

        int gupDevAllApps = coreSettings.getInt(Settings.Global.GUP_DEV_ALL_APPS, 0);

        if (gupDevAllApps == 2) {

            if (DEBUG) {

                Log.w(TAG, "GUP is turned off on this device");

            }

            return;

        }



        if (gupDevAllApps != 1) {

            // GUP_DEV_OPT_OUT_APPS has higher priority than GUP_DEV_OPT_IN_APPS

            if (getGlobalSettingsString(coreSettings, Settings.Global.GUP_DEV_OPT_OUT_APPS)

                            .contains(ai.packageName)) {

                if (DEBUG) {
@@ -186,6 +200,7 @@ public class GraphicsEnvironment { 
                }

                return;

            }

        }



        ApplicationInfo driverInfo;

        try {

core/java/android/provider/Settings.java

+15 −4
Original line number Diff line number Diff line
@@ -11446,13 +11446,24 @@ public final class Settings { 
        public static final String GPU_DEBUG_APP = "gpu_debug_app";















        /**













         * List of Apps selected to use Game Update Packages.













         * Game Update Package global preference for all Apps.













         * 0 = Default













         * 1 = All Apps use Game Update Package













         * 2 = All Apps use system graphics driver













         * @hide













         */













        public static final String GUP_DEV_ALL_APPS = "gup_dev_all_apps";

























        /**













         * List of Apps selected to use Game Update Package.













         * i.e. <pkg1>,<pkg2>,...,<pkgN>















         * @hide















         */















        public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps";





























        /**













         * List of Apps selected not to use Game Update Packages.













         * List of Apps selected not to use Game Update Package.













         * i.e. <pkg1>,<pkg2>,...,<pkgN>















         * @hide















         */















        public static final String GUP_DEV_OPT_OUT_APPS = "gup_dev_opt_out_apps";









@@ -11461,7 +11472,7 @@ public final class Settings {













         * Apps on the blacklist that are forbidden to use Game Update Package.















         * @hide















         */













        public static final String GUP_BLACK_LIST = "gup_black_list";













        public static final String GUP_BLACKLIST = "gup_blacklist";





























        /**















         * Ordered GPU debug layer list

































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



+13
−6




























Original line number
Diff line number
Diff line








@@ -384,12 +384,19 @@ message GlobalSettingsProto {













        // App allowed to load GPU debug layers.















        optional SettingProto debug_app = 1;















        optional SettingProto debug_layers = 2 [ (android.privacy).dest = DEST_AUTOMATIC ];













        // GUP - List of Apps selected to use Game Update Packages













        optional SettingProto gup_dev_opt_in_apps = 8;













        // GUP - List of Apps selected not to use Game Update Packages













        optional SettingProto gup_dev_opt_out_apps = 9;













        // GUP - List of Apps that are forbidden to use Game Update Packages













        optional SettingProto gup_black_list = 10;













        // GUP - Game Update Package global preference for all Apps













        // 0 = Default













        // 1 = All Apps use Game Update Package













        // 2 = All Apps use system graphics driver













        optional SettingProto gup_dev_all_apps = 8;













        // GUP - List of Apps selected to use Game Update Package













        // i.e. <pkg1>,<pkg2>,...,<pkgN>













        optional SettingProto gup_dev_opt_in_apps = 9;













        // GUP - List of Apps selected not to use Game Update Package













        // i.e. <pkg1>,<pkg2>,...,<pkgN>













        optional SettingProto gup_dev_opt_out_apps = 10;













        // GUP - List of Apps that are forbidden to use Game Update Package













        optional SettingProto gup_blacklist = 11;















    }















    optional Gpu gpu = 59;

















































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -444,9 +444,10 @@ public class SettingsBackupTest {













                    Settings.Global.ENABLE_GPU_DEBUG_LAYERS,















                    Settings.Global.GPU_DEBUG_APP,















                    Settings.Global.GPU_DEBUG_LAYERS,













                    Settings.Global.GUP_DEV_ALL_APPS,















                    Settings.Global.GUP_DEV_OPT_IN_APPS,















                    Settings.Global.GUP_DEV_OPT_OUT_APPS,













                    Settings.Global.GUP_BLACK_LIST,













                    Settings.Global.GUP_BLACKLIST,















                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,















                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,















                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,

































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



+5
−2




























Original line number
Diff line number
Diff line








@@ -647,6 +647,9 @@ class SettingsProtoDumpUtil {













        dumpSetting(s, p,















                Settings.Global.GPU_DEBUG_LAYERS,















                GlobalSettingsProto.Gpu.DEBUG_LAYERS);













        dumpSetting(s, p,













                Settings.Global.GUP_DEV_ALL_APPS,













                GlobalSettingsProto.Gpu.GUP_DEV_ALL_APPS);















        dumpSetting(s, p,















                Settings.Global.GUP_DEV_OPT_IN_APPS,















                GlobalSettingsProto.Gpu.GUP_DEV_OPT_IN_APPS);









@@ -654,8 +657,8 @@ class SettingsProtoDumpUtil {













                Settings.Global.GUP_DEV_OPT_OUT_APPS,















                GlobalSettingsProto.Gpu.GUP_DEV_OPT_OUT_APPS);















        dumpSetting(s, p,













                Settings.Global.GUP_BLACK_LIST,













                GlobalSettingsProto.Gpu.GUP_BLACK_LIST);













                Settings.Global.GUP_BLACKLIST,













                GlobalSettingsProto.Gpu.GUP_BLACKLIST);















        p.end(gpuToken);































        final long hdmiToken = p.start(GlobalSettingsProto.HDMI);