Merge "Add check for null manger for a11y recents action" (02ea9b75) · Commits · e / os / android_frameworks_base

core/java/android/accessibilityservice/AccessibilityService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -334,7 +334,8 @@ public abstract class AccessibilityService extends Service {
		public static final int GLOBAL_ACTION_HOME = 2;

		/**
		* Action to toggle showing the overview of recent apps
		* Action to toggle showing the overview of recent apps. Will fail on platforms that don't
		* show recent apps.
		*/
		public static final int GLOBAL_ACTION_RECENTS = 3;

+14 −9

Original line number	Diff line number	Diff line
		@@ -2927,8 +2927,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		sendDownAndUpKeyEvents(KeyEvent.KEYCODE_HOME);
		} return true;
		case AccessibilityService.GLOBAL_ACTION_RECENTS: {
		openRecents();
		} return true;
		return openRecents();
		}
		case AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS: {
		expandNotifications();
		} return true;
		@@ -3421,15 +3421,20 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		Binder.restoreCallingIdentity(token);
		}

		private void openRecents() {
		private boolean openRecents() {
		final long token = Binder.clearCallingIdentity();

		try {
		StatusBarManagerInternal statusBarService = LocalServices.getService(
		StatusBarManagerInternal.class);
		if (statusBarService == null) {
		return false;
		}
		statusBarService.toggleRecentApps();

		} finally {
		Binder.restoreCallingIdentity(token);
		}
		return true;
		}

		private void showGlobalActions() {
		mWindowManagerService.showGlobalActions();