Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev (a4fca2c7) · Commits · e / os / android_frameworks_base

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

+4 −1

Original line number	Diff line number	Diff line
		@@ -289,6 +289,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		private DozeServiceHost mDozeServiceHost;
		private boolean mWakeUpComingFromTouch;
		private PointF mWakeUpTouchLocation;
		private boolean mScreenTurningOn;

		int mPixelFormat;
		Object mQueueLock = new Object();
		@@ -3921,6 +3922,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void onScreenTurningOn() {
		mScreenTurningOn = true;
		mNotificationPanel.onScreenTurningOn();
		if (mLaunchCameraOnScreenTurningOn) {
		mNotificationPanel.launchCamera(false);
		@@ -3933,6 +3935,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}

		public void onScreenTurnedOn() {
		mScreenTurningOn = false;
		mDozeScrimController.onScreenTurnedOn();
		}

		@@ -4108,7 +4111,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		mScrimController.dontAnimateBouncerChangesUntilNextFrame();
		mGestureWakeLock.acquire(LAUNCH_TRANSITION_TIMEOUT_MS + 1000L);
		}
		if (mStatusBarKeyguardViewManager.isScreenTurnedOn()) {
		if (mScreenTurningOn \|\| mStatusBarKeyguardViewManager.isScreenTurnedOn()) {
		mNotificationPanel.launchCamera(mDeviceInteractive /* animate */);
		} else {
		// We need to defer the camera launch until the screen comes on, since otherwise