commit b033545b2f1a205241d1a06ac02412e8cd5ea464
author Hyunyoung Song <hyunyoungs@google.com> Tue Apr 23 14:21:00 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Apr 23 14:21:00 2019 -0700
tree 07356509549a5a72c7b0cca1a0ba588c23d6a1bc
parent cd47318cfbb0bbd3a238c9c361cd1fc9ae5fc0e4
parent c51ef32c2b98b94db14d52000bc7bad52df8fbff

Merge "3->1 binder calls to OverlayManager for Navbar settings" into qt-dev
am: c51ef32c2b

Change-Id: I4307434d56d5776bccb7ba977e3dde5883b55c8e

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 4d287eaa..b5d4821 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -4353,15 +4353,20 @@
                     }
 
                     if (navBarMode != -1) {
+                        String overlayPackage = "";
                         try {
-                            overlayManager.setEnabled(NAV_BAR_MODE_3BUTTON_OVERLAY,
-                                    navBarMode == NAV_BAR_MODE_3BUTTON,
-                                    UserHandle.USER_CURRENT);
-                            overlayManager.setEnabled(NAV_BAR_MODE_2BUTTON_OVERLAY,
-                                    navBarMode == NAV_BAR_MODE_2BUTTON,
-                                    UserHandle.USER_CURRENT);
-                            overlayManager.setEnabled(NAV_BAR_MODE_GESTURAL_OVERLAY,
-                                    navBarMode == NAV_BAR_MODE_GESTURAL,
+                            switch (navBarMode) {
+                                case NAV_BAR_MODE_3BUTTON:
+                                    overlayPackage = NAV_BAR_MODE_3BUTTON_OVERLAY;
+                                    break;
+                                case NAV_BAR_MODE_2BUTTON:
+                                    overlayPackage = NAV_BAR_MODE_2BUTTON_OVERLAY;
+                                    break;
+                                case NAV_BAR_MODE_GESTURAL:
+                                    overlayPackage = NAV_BAR_MODE_GESTURAL_OVERLAY;
+                                    break;
+                            }
+                            overlayManager.setEnabledExclusiveInCategory(overlayPackage,
                                     UserHandle.USER_CURRENT);
                         } catch (RemoteException e) {
                             throw new IllegalStateException(