From 8eeb14e639358c5b667a8c11785f7a690bc966f7 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Wed, 26 Dec 2018 13:22:52 -0800 Subject: [PATCH] Rename updatable graphics driver to Game Update Package. We have rebranded this project to Game Update Package, and GUP for short. BUG: 119221883 Test: Build, flash and boot. Verify by going to developer options. Change-Id: If284bd3e0b29cb025833be29fa33179011c151d7 Merged-In: If284bd3e0b29cb025833be29fa33179011c151d7 --- core/java/android/os/GraphicsEnvironment.java | 2 +- core/java/android/provider/Settings.java | 11 ++++++++--- core/proto/android/providers/settings/global.proto | 8 +++++--- .../src/android/provider/SettingsBackupTest.java | 3 ++- packages/SettingsLib/res/values/strings.xml | 2 +- .../providers/settings/SettingsProtoDumpUtil.java | 7 +++++-- .../com/android/server/am/CoreSettingsObserver.java | 4 ++-- 7 files changed, 24 insertions(+), 13 deletions(-) diff --git a/core/java/android/os/GraphicsEnvironment.java b/core/java/android/os/GraphicsEnvironment.java index 2773c0e2e25d6..606c8f398563c 100644 --- a/core/java/android/os/GraphicsEnvironment.java +++ b/core/java/android/os/GraphicsEnvironment.java @@ -156,7 +156,7 @@ public class GraphicsEnvironment { String applicationPackageName = context.getPackageName(); String devOptInApplicationName = coreSettings.getString( - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + Settings.Global.GUP_DEV_OPT_IN_APPS); boolean devOptIn = applicationPackageName.equals(devOptInApplicationName); boolean whitelisted = onWhitelist(context, driverPackageName, ai.packageName); if (!devOptIn && !whitelisted) { diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 734df0dd36a48..bf33e06193045 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -11446,11 +11446,16 @@ public final class Settings { public static final String GPU_DEBUG_APP = "gpu_debug_app"; /** - * App that is selected to use updated graphics driver. + * Apps that are selected to use Game Update Package. * @hide */ - public static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = - "updated_gfx_driver_dev_opt_in_app"; + public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps"; + + /** + * Apps on the black list that are forbidden to useGame Update Package. + * @hide + */ + public static final String GUP_BLACK_LIST = "gup_black_list"; /** * Ordered GPU debug layer list diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index c8cf8c306c158..7c9176aa9eb72 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -384,9 +384,11 @@ message GlobalSettingsProto { // App allowed to load GPU debug layers. optional SettingProto debug_app = 1; optional SettingProto debug_layers = 2 [ (android.privacy).dest = DEST_AUTOMATIC ]; - // App opt in to load updated graphics driver instead of - // native graphcis driver through developer options. - optional SettingProto updated_gfx_driver_dev_opt_in_app = 6; + // Apps opt in to load graphics driver from Game Update Package + // instead of native graphcis driver through developer options. + optional SettingProto gup_dev_opt_in_apps = 8; + // Apps on the black list that are forbidden to useGame Update Package. + optional SettingProto gup_black_list = 9; } optional Gpu gpu = 59; diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index 8976f45fc4e30..7b729284a063d 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -444,7 +444,8 @@ public class SettingsBackupTest { Settings.Global.ENABLE_GPU_DEBUG_LAYERS, Settings.Global.GPU_DEBUG_APP, Settings.Global.GPU_DEBUG_LAYERS, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, + Settings.Global.GUP_DEV_OPT_IN_APPS, + Settings.Global.GUP_BLACK_LIST, Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS, diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 4684ab99586c0..2c4abaeb9949f 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1133,5 +1133,5 @@ - Opt in app to use updated graphcis driver in developement + Opt in app to use Game Update Package in developement diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 34448f567ad82..759b51c853da8 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -648,8 +648,11 @@ class SettingsProtoDumpUtil { Settings.Global.GPU_DEBUG_LAYERS, GlobalSettingsProto.Gpu.DEBUG_LAYERS); dumpSetting(s, p, - Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, - GlobalSettingsProto.Gpu.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); + Settings.Global.GUP_DEV_OPT_IN_APPS, + GlobalSettingsProto.Gpu.GUP_DEV_OPT_IN_APPS); + dumpSetting(s, p, + Settings.Global.GUP_BLACK_LIST, + GlobalSettingsProto.Gpu.GUP_BLACK_LIST); p.end(gpuToken); final long hdmiToken = p.start(GlobalSettingsProto.HDMI); diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java index ee3d3a1ddee6b..63300a1c05cd4 100644 --- a/services/core/java/com/android/server/am/CoreSettingsObserver.java +++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java @@ -55,8 +55,8 @@ final class CoreSettingsObserver extends ContentObserver { // add other system settings here... sGlobalSettingToTypeMap.put(Settings.Global.DEBUG_VIEW_ATTRIBUTES, int.class); - sGlobalSettingToTypeMap.put(Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, - String.class); + sGlobalSettingToTypeMap.put(Settings.Global.GUP_DEV_OPT_IN_APPS, String.class); + sGlobalSettingToTypeMap.put(Settings.Global.GUP_BLACK_LIST, String.class); // add other global settings here... }