Merge "Fixed issue where camera wouldn't launch" (7ab6878f) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -3098,10 +3098,8 @@ public class NotificationPanelView extends PanelView implements

		/**
		* Whether the camera application can be launched for the camera launch gesture.
		*
		* @param keyguardIsShowing whether keyguard is being shown
		*/
		public boolean canCameraGestureBeLaunched(boolean keyguardIsShowing) {
		public boolean canCameraGestureBeLaunched() {
		if (!mStatusBar.isCameraAllowedByAdmin()) {
		return false;
		}
		@@ -3110,7 +3108,7 @@ public class NotificationPanelView extends PanelView implements
		String packageToLaunch = (resolveInfo == null \|\| resolveInfo.activityInfo == null)
		? null : resolveInfo.activityInfo.packageName;
		return packageToLaunch != null &&
		(keyguardIsShowing \|\| !isForegroundApp(packageToLaunch))
		(mBarState != StatusBarState.SHADE \|\| !isForegroundApp(packageToLaunch))
		&& !mAffordanceHelper.isSwipingInProgress();
		}

+2 −4

Original line number	Diff line number	Diff line
		@@ -3785,10 +3785,8 @@ public class StatusBar extends SystemUI implements DemoMode,
		mLaunchCameraOnFinishedGoingToSleep = true;
		return;
		}
		if (!mNotificationPanel.canCameraGestureBeLaunched(
		mStatusBarKeyguardViewManager.isShowing() && mExpandedVisible)) {
		if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now, mExpandedVisible: " +
		mExpandedVisible);
		if (!mNotificationPanel.canCameraGestureBeLaunched()) {
		if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Can't launch camera right now");
		return;
		}
		if (!mDeviceInteractive) {