commit f2c9466eaa819654f6535f1b260493769ca116a3
author Peiyong Lin <lpy@google.com> Wed Sep 30 01:22:26 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 30 01:22:26 2020 +0000
tree c4b63d3635168d655dc52330c218b71852d2b6aa
parent 3022e62c202ef2bca788a2fe14cc665bbb3e936b
parent e424e41075d8189e8e33e3ba2364e1de8a00c098

Merge "angle_gl_driver_all_angle should accept integer."

services/core/java/com/android/server/am/CoreSettingsObserver.java

diff --git a/services/core/java/com/android/server/am/CoreSettingsObserver.java b/services/core/java/com/android/server/am/CoreSettingsObserver.java
index 757b4e8..4192455 100644
--- a/services/core/java/com/android/server/am/CoreSettingsObserver.java
+++ b/services/core/java/com/android/server/am/CoreSettingsObserver.java
@@ -86,7 +86,7 @@
         sGlobalSettingToTypeMap.put(
                 Settings.Global.GLOBAL_SETTINGS_ANGLE_DEBUG_PACKAGE, String.class);
         sGlobalSettingToTypeMap.put(
-                Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, String.class);
+                Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_ALL_ANGLE, int.class);
         sGlobalSettingToTypeMap.put(
                 Settings.Global.GLOBAL_SETTINGS_ANGLE_GL_DRIVER_SELECTION_PKGS, String.class);
         sGlobalSettingToTypeMap.put(