Merge "fix NPE - ring lockscreen" into gingerbread (398bedcd) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/LockScreen.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -812,9 +812,7 @@ class LockScreen extends LinearLayout implements KeyguardScreen, KeyguardUpdateM
		if (grabbedState != SlidingTab.OnTriggerListener.NO_HANDLE) {
		mGestureOverlay.cancelGesture();
		mCallback.pokeWakelock();
		}

		if (mUseRingLockscreen) {
		} else if (mUseRingLockscreen && mCallback != null) {
		mCallback.pokeWakelock();
		}
		}