Merge "Poke user activity when showing the global actions menu." (ece99121) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1655,12 +1655,10 @@ public class PhoneWindowManager implements WindowManagerPolicy {
	}		}
	final boolean keyguardShowing = isKeyguardShowingAndNotOccluded();		final boolean keyguardShowing = isKeyguardShowingAndNotOccluded();
	mGlobalActions.showDialog(keyguardShowing, isDeviceProvisioned());		mGlobalActions.showDialog(keyguardShowing, isDeviceProvisioned());
	if (keyguardShowing) {
	// since it took two seconds of long press to bring this up,		// since it took two seconds of long press to bring this up,
	// poke the wake lock so they have some time to see the dialog.		// poke the wake lock so they have some time to see the dialog.
	mPowerManager.userActivity(SystemClock.uptimeMillis(), false);		mPowerManager.userActivity(SystemClock.uptimeMillis(), false);
	}		}
	}

	boolean isDeviceProvisioned() {		boolean isDeviceProvisioned() {
	return Settings.Global.getInt(		return Settings.Global.getInt(