Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add 2 ANGLE deferlist settings"" am: 5594c74e45

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2596848

Change-Id: I1339e9dd5632f3aee32c663bccbbf01edcf4e043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Peiyong Lin
2023-05-19 12:04:47 +00:00
committed by Automerger Merge Worker
parent 197fe45fce 5594c74e45
commit 1942ca4cb9
4 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -14704,18 +14704,6 @@ public final class Settings {
@Readable @Readable
public static final String ANGLE_EGL_FEATURES = "angle_egl_features"; 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. * Show the "ANGLE In Use" dialog box to the user when ANGLE is the OpenGL driver.
* The value is a boolean (1 or 0). * The value is a boolean (1 or 0).

4
core/proto/android/providers/settings/global.proto
View File

@@ -468,10 +468,6 @@ message GlobalSettingsProto {
optional SettingProto updatable_driver_prerelease_opt_in_apps = 18; optional SettingProto updatable_driver_prerelease_opt_in_apps = 18;
optional SettingProto angle_egl_features = 19; 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; optional Gpu gpu = 59;

6
packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
View File

@@ -770,12 +770,6 @@ class SettingsProtoDumpUtil {
dumpSetting(s, p, dumpSetting(s, p,
Settings.Global.ANGLE_EGL_FEATURES, Settings.Global.ANGLE_EGL_FEATURES,
GlobalSettingsProto.Gpu.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, dumpSetting(s, p,
Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX,
GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG); GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG);

2
packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java
View File

@@ -515,8 +515,6 @@ public class SettingsBackupTest {
Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS, Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS,
Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES, Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES,
Settings.Global.ANGLE_EGL_FEATURES, Settings.Global.ANGLE_EGL_FEATURES,
Settings.Global.ANGLE_DEFERLIST,
Settings.Global.ANGLE_DEFERLIST_MODE,
Settings.Global.UPDATABLE_DRIVER_ALL_APPS, Settings.Global.UPDATABLE_DRIVER_ALL_APPS,
Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS,
Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,