From 8b581721f9f6e631af7693c45996332d5f9a3361 Mon Sep 17 00:00:00 2001 From: Peiyong Lin Date: Fri, 19 May 2023 00:04:41 +0000 Subject: [PATCH] Revert "Add 2 ANGLE deferlist settings" This reverts commit ef6fa3f9d3710df7558a9cbbd9e31c3307bd495a. Reason for revert: Remove deferred list functionality now that the shape of ANGLE shipping form is binaries. Applications on the list are broken with ANGLE due to the lack of YUV support, this is currently being worked on. Bug: 280450222 Test: atest CtsAngleIntegrationHostTestCases Change-Id: Iec8a0fec238fea2cdd43b8988a8abdc997a9d726 --- core/java/android/provider/Settings.java | 12 ------------ core/proto/android/providers/settings/global.proto | 4 ---- .../providers/settings/SettingsProtoDumpUtil.java | 6 ------ .../src/android/provider/SettingsBackupTest.java | 2 -- 4 files changed, 24 deletions(-) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5c79f697ba13d..d695c0cb3760c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -15309,18 +15309,6 @@ public final class Settings { @Readable 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. * The value is a boolean (1 or 0). diff --git a/core/proto/android/providers/settings/global.proto b/core/proto/android/providers/settings/global.proto index 128de8bf47dfc..052e2f20a3137 100644 --- a/core/proto/android/providers/settings/global.proto +++ b/core/proto/android/providers/settings/global.proto @@ -471,10 +471,6 @@ message GlobalSettingsProto { optional SettingProto updatable_driver_prerelease_opt_in_apps = 18; 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; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java index 1fd84c7191960..a83bfda41f3db 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java @@ -784,12 +784,6 @@ class SettingsProtoDumpUtil { dumpSetting(s, p, Settings.Global.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, Settings.Global.SHOW_ANGLE_IN_USE_DIALOG_BOX, GlobalSettingsProto.Gpu.SHOW_ANGLE_IN_USE_DIALOG); diff --git a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java index ef4b81491ce11..873b434aa4fdf 100644 --- a/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java +++ b/packages/SettingsProvider/test/src/android/provider/SettingsBackupTest.java @@ -518,8 +518,6 @@ public class SettingsBackupTest { Settings.Global.ANGLE_GL_DRIVER_SELECTION_PKGS, Settings.Global.ANGLE_GL_DRIVER_SELECTION_VALUES, Settings.Global.ANGLE_EGL_FEATURES, - Settings.Global.ANGLE_DEFERLIST, - Settings.Global.ANGLE_DEFERLIST_MODE, Settings.Global.UPDATABLE_DRIVER_ALL_APPS, Settings.Global.UPDATABLE_DRIVER_PRODUCTION_OPT_IN_APPS, Settings.Global.UPDATABLE_DRIVER_PRERELEASE_OPT_IN_APPS,