Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev am: 5f328aff51

am: e85166328c

Change-Id: Ic68b26bbe3daa61650b78bc00372566a3194e97a
This commit is contained in:
Hyunyoung Song
2019-04-23 15:10:06 -07:00
committed by android-build-merger

View File

@@ -139,12 +139,11 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
* Enables the specified overlay package. * Enables the specified overlay package.
*/ */
static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) { static void setNavBarInteractionMode(IOverlayManager overlayManager, String overlayPackage) {
setOverlayEnabled(overlayManager, NAV_BAR_MODE_3BUTTON_OVERLAY, try {
overlayPackage == NAV_BAR_MODE_3BUTTON_OVERLAY); overlayManager.setEnabledExclusiveInCategory(overlayPackage, USER_CURRENT);
setOverlayEnabled(overlayManager, NAV_BAR_MODE_2BUTTON_OVERLAY, } catch (RemoteException e) {
overlayPackage == NAV_BAR_MODE_2BUTTON_OVERLAY); throw e.rethrowFromSystemServer();
setOverlayEnabled(overlayManager, NAV_BAR_MODE_GESTURAL_OVERLAY, }
overlayPackage == NAV_BAR_MODE_GESTURAL_OVERLAY);
} }
static boolean isSwipeUpEnabled(Context context) { static boolean isSwipeUpEnabled(Context context) {
@@ -159,12 +158,4 @@ public abstract class SystemNavigationPreferenceController extends GesturePrefer
return NAV_BAR_MODE_GESTURAL == context.getResources().getInteger( return NAV_BAR_MODE_GESTURAL == context.getResources().getInteger(
com.android.internal.R.integer.config_navBarInteractionMode); com.android.internal.R.integer.config_navBarInteractionMode);
} }
static void setOverlayEnabled(IOverlayManager overlayManager, String pkg, boolean enabled) {
try {
overlayManager.setEnabled(pkg, enabled, USER_CURRENT);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
}
} }