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
This commit is contained in:
Peiyong Lin
2018-12-26 13:22:52 -08:00
parent 252e8d0447
commit b33ffca825
7 changed files with 24 additions and 13 deletions

View File

@@ -482,7 +482,7 @@ public class GraphicsEnvironment {
String applicationPackageName = context.getPackageName(); String applicationPackageName = context.getPackageName();
String devOptInApplicationName = coreSettings.getString( 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 devOptIn = applicationPackageName.equals(devOptInApplicationName);
boolean whitelisted = onWhitelist(context, driverPackageName, ai.packageName); boolean whitelisted = onWhitelist(context, driverPackageName, ai.packageName);
if (!devOptIn && !whitelisted) { if (!devOptIn && !whitelisted) {

View File

@@ -11971,11 +11971,16 @@ public final class Settings {
"angle_gl_driver_selection_values"; "angle_gl_driver_selection_values";
/** /**
* App that is selected to use updated graphics driver. * Apps that are selected to use Game Update Package.
* @hide * @hide
*/ */
public static final String UPDATED_GFX_DRIVER_DEV_OPT_IN_APP = public static final String GUP_DEV_OPT_IN_APPS = "gup_dev_opt_in_apps";
"updated_gfx_driver_dev_opt_in_app";
/**
* 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 for Vulkan * Ordered GPU debug layer list for Vulkan

View File

@@ -436,9 +436,11 @@ message GlobalSettingsProto {
// Ordered GPU debug layer list for GLES // Ordered GPU debug layer list for GLES
// i.e. <layer1>:<layer2>:...:<layerN> // i.e. <layer1>:<layer2>:...:<layerN>
optional SettingProto debug_layers_gles = 7; optional SettingProto debug_layers_gles = 7;
// App opt in to load updated graphics driver instead of // Apps opt in to load graphics driver from Game Update Package
// native graphcis driver through developer options. // instead of native graphcis driver through developer options.
optional SettingProto updated_gfx_driver_dev_opt_in_app = 8; 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; optional Gpu gpu = 59;

View File

@@ -475,7 +475,8 @@ public class SettingsBackupTest {
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, 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_PKGS,
Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES, Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_VALUES,
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, Settings.Global.GUP_DEV_OPT_IN_APPS,
Settings.Global.GUP_BLACK_LIST,
Settings.Global.GPU_DEBUG_LAYER_APP, Settings.Global.GPU_DEBUG_LAYER_APP,
Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING, Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,
Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT, Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,

View File

@@ -1138,7 +1138,7 @@
<string name="notice_header" translatable="false"></string> <string name="notice_header" translatable="false"></string>
<!-- UI debug setting: opt in to use updated graphics driver? [CHAR LIMIT=100] --> <!-- UI debug setting: opt in to use updated graphics driver? [CHAR LIMIT=100] -->
<string name="updated_gfx_driver_dev_opt_in_app_summary">Opt in app to use updated graphcis driver in developement</string> <string name="gup_dev_opt_in_app_summary">Opt in app to use Game Update Package in developement</string>
<!-- Name of the phone device [CHAR LIMIT=NONE] --> <!-- Name of the phone device [CHAR LIMIT=NONE] -->
<string name="media_transfer_phone_device_name">Phone speaker</string> <string name="media_transfer_phone_device_name">Phone speaker</string>

View File

@@ -705,8 +705,11 @@ class SettingsProtoDumpUtil {
Settings.Global.GPU_DEBUG_LAYERS_GLES, Settings.Global.GPU_DEBUG_LAYERS_GLES,
GlobalSettingsProto.Gpu.DEBUG_LAYERS_GLES); GlobalSettingsProto.Gpu.DEBUG_LAYERS_GLES);
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, Settings.Global.GUP_DEV_OPT_IN_APPS,
GlobalSettingsProto.Gpu.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP); GlobalSettingsProto.Gpu.GUP_DEV_OPT_IN_APPS);
dumpSetting(s, p,
Settings.Global.GUP_BLACK_LIST,
GlobalSettingsProto.Gpu.GUP_BLACK_LIST);
p.end(gpuToken); p.end(gpuToken);
final long hdmiToken = p.start(GlobalSettingsProto.HDMI); final long hdmiToken = p.start(GlobalSettingsProto.HDMI);

View File

@@ -67,8 +67,8 @@ final class CoreSettingsObserver extends ContentObserver {
sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYERS_GLES, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYERS_GLES, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYER_APP, String.class); sGlobalSettingToTypeMap.put(Settings.Global.GPU_DEBUG_LAYER_APP, String.class);
sGlobalSettingToTypeMap.put(Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, int.class); sGlobalSettingToTypeMap.put(Settings.Global.SMS_ACCESS_RESTRICTION_ENABLED, int.class);
sGlobalSettingToTypeMap.put(Settings.Global.UPDATED_GFX_DRIVER_DEV_OPT_IN_APP, sGlobalSettingToTypeMap.put(Settings.Global.GUP_DEV_OPT_IN_APPS, String.class);
String.class); sGlobalSettingToTypeMap.put(Settings.Global.GUP_BLACK_LIST, String.class);
// add other global settings here... // add other global settings here...
} }