Merge "Fix camera race condition" into qt-dev am: f2c4f55435 (b0a59e17) · Commits · e / os / android_frameworks_base

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

+13 −15

Original line number	Diff line number	Diff line
		@@ -494,7 +494,7 @@ public class StatusBar extends SystemUI implements DemoMode,

		private Runnable mLaunchTransitionEndRunnable;
		private NotificationEntry mDraggedDownEntry;
		private boolean mLaunchCameraOnScreenTurningOn;
		private boolean mLaunchCameraWhenFinishedWaking;
		private boolean mLaunchCameraOnFinishedGoingToSleep;
		private int mLastCameraLaunchSource;
		protected PowerManager.WakeLock mGestureWakeLock;
		@@ -3600,7 +3600,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		public void onFinishedGoingToSleep() {
		mNotificationPanel.onAffordanceLaunchEnded();
		releaseGestureWakeLock();
		mLaunchCameraOnScreenTurningOn = false;
		mLaunchCameraWhenFinishedWaking = false;
		mDeviceInteractive = false;
		mWakeUpComingFromTouch = false;
		mWakeUpTouchLocation = null;
		@@ -3647,6 +3647,11 @@ public class StatusBar extends SystemUI implements DemoMode,
		@Override
		public void onFinishedWakingUp() {
		mWakeUpCoordinator.setWakingUp(false);
		if (mLaunchCameraWhenFinishedWaking) {
		mNotificationPanel.launchCamera(false /* animate */, mLastCameraLaunchSource);
		mLaunchCameraWhenFinishedWaking = false;
		}
		updateScrimController();
		}
		};

		@@ -3668,13 +3673,6 @@ public class StatusBar extends SystemUI implements DemoMode,
		public void onScreenTurningOn() {
		mFalsingManager.onScreenTurningOn();
		mNotificationPanel.onScreenTurningOn();

		if (mLaunchCameraOnScreenTurningOn) {
		mNotificationPanel.launchCamera(false, mLastCameraLaunchSource);
		mLaunchCameraOnScreenTurningOn = false;
		}

		updateScrimController();
		}

		@Override
		@@ -3775,7 +3773,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		// comes on.
		mGestureWakeLock.acquire(LAUNCH_TRANSITION_TIMEOUT_MS + 1000L);
		}
		if (isScreenTurningOnOrOn()) {
		if (isWakingUpOrAwake()) {
		if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Launching camera");
		if (mStatusBarKeyguardViewManager.isBouncerShowing()) {
		mStatusBarKeyguardViewManager.reset(true /* hide */);
		@@ -3788,7 +3786,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		// incorrectly get notified because of the screen on event (which resumes and pauses
		// some activities)
		if (DEBUG_CAMERA_LIFT) Slog.d(TAG, "Deferring until screen turns on");
		mLaunchCameraOnScreenTurningOn = true;
		mLaunchCameraWhenFinishedWaking = true;
		}
		}
		}
		@@ -3813,9 +3811,9 @@ public class StatusBar extends SystemUI implements DemoMode,
		== WakefulnessLifecycle.WAKEFULNESS_GOING_TO_SLEEP;
		}

		private boolean isScreenTurningOnOrOn() {
		return mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_TURNING_ON
		\|\| mScreenLifecycle.getScreenState() == ScreenLifecycle.SCREEN_ON;
		private boolean isWakingUpOrAwake() {
		return mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_AWAKE
		\|\| mWakefulnessLifecycle.getWakefulness() == WAKEFULNESS_WAKING;
		}

		public void notifyBiometricAuthModeChanged() {
		@@ -3847,7 +3845,7 @@ public class StatusBar extends SystemUI implements DemoMode,
		ScrimState state = mStatusBarKeyguardViewManager.bouncerNeedsScrimming()
		? ScrimState.BOUNCER_SCRIMMED : ScrimState.BOUNCER;
		mScrimController.transitionTo(state);
		} else if (isInLaunchTransition() \|\| mLaunchCameraOnScreenTurningOn
		} else if (isInLaunchTransition() \|\| mLaunchCameraWhenFinishedWaking
		\|\| launchingAffordanceWithPreview) {
		mScrimController.transitionTo(ScrimState.UNLOCKED, mUnlockScrimCallback);
		} else if (mBrightnessMirrorVisible) {