am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly... (76d9bf52) · Commits · e / os / android_frameworks_base

core/java/android/os/IPowerManager.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ interface IPowerManager
		void releaseWakeLock(IBinder lock, int flags);
		void userActivity(long when, boolean noChangeLights);
		void userActivityWithForce(long when, boolean noChangeLights, boolean force);
		void clearUserActivityTimeout(long now, long timeout);
		void setPokeLock(int pokey, IBinder lock, String tag);
		int getSupportedWakeLockFlags();
		void setStayOnSetting(int val);

services/java/com/android/server/PowerManagerService.java

+76 −30

Original line number	Diff line number	Diff line
		@@ -1030,38 +1030,69 @@ class PowerManagerService extends IPowerManager.Stub
		}
		}

		private void setTimeoutLocked(long now, int nextState)
		{
		private void setTimeoutLocked(long now, int nextState) {
		setTimeoutLocked(now, -1, nextState);
		}

		// If they gave a timeoutOverride it is the number of seconds
		// to screen-off. Figure out where in the countdown cycle we
		// should jump to.
		private void setTimeoutLocked(long now, long timeoutOverride, int nextState) {
		if (mBootCompleted) {
		synchronized (mLocks) {
		mHandler.removeCallbacks(mTimeoutTask);
		mTimeoutTask.nextState = nextState;
		long when = now;
		long when = 0;
		if (timeoutOverride <= 0) {
		switch (nextState)
		{
		case SCREEN_BRIGHT:
		when += mKeylightDelay;
		when = now + mKeylightDelay;
		break;
		case SCREEN_DIM:
		if (mDimDelay >= 0) {
		when += mDimDelay;
		break;
		when = now + mDimDelay;
		} else {
		Slog.w(TAG, "mDimDelay=" + mDimDelay + " while trying to dim");
		}
		case SCREEN_OFF:
		synchronized (mLocks) {
		when += mScreenOffDelay;
		when = now + mScreenOffDelay;
		}
		break;
		}
		} else {
		override: {
		if (timeoutOverride <= mScreenOffDelay) {
		when = now + timeoutOverride;
		nextState = SCREEN_OFF;
		break override;
		}
		timeoutOverride -= mScreenOffDelay;

		if (mDimDelay >= 0) {
		if (timeoutOverride <= mDimDelay) {
		when = now + timeoutOverride;
		nextState = SCREEN_DIM;
		break override;
		}
		timeoutOverride -= mDimDelay;
		}

		when = now + timeoutOverride;
		nextState = SCREEN_BRIGHT;
		}
		}
		if (mSpew) {
		Slog.d(TAG, "setTimeoutLocked now=" + now + " nextState=" + nextState
		+ " when=" + when);
		Slog.d(TAG, "setTimeoutLocked now=" + now
		+ " timeoutOverride=" + timeoutOverride
		+ " nextState=" + nextState + " when=" + when);
		}
		mHandler.postAtTime(mTimeoutTask, when);
		mNextTimeout = when; // for debugging
		}
		}
		}

		private void cancelTimerLocked()
		{
		@@ -1974,18 +2005,33 @@ class PowerManagerService extends IPowerManager.Stub

		public void userActivityWithForce(long time, boolean noChangeLights, boolean force) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
		userActivity(time, noChangeLights, OTHER_EVENT, force);
		userActivity(time, -1, noChangeLights, OTHER_EVENT, force);
		}

		public void userActivity(long time, boolean noChangeLights) {
		userActivity(time, noChangeLights, OTHER_EVENT, false);
		userActivity(time, -1, noChangeLights, OTHER_EVENT, false);
		}

		public void userActivity(long time, boolean noChangeLights, int eventType) {
		userActivity(time, noChangeLights, eventType, false);
		userActivity(time, -1, noChangeLights, eventType, false);
		}

		public void userActivity(long time, boolean noChangeLights, int eventType, boolean force) {
		userActivity(time, -1, noChangeLights, eventType, force);
		}

		/*
		* Reset the user activity timeout to now + timeout. This overrides whatever else is going
		* on with user activity. Don't use this function.
		*/
		public void clearUserActivityTimeout(long now, long timeout) {
		mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);
		Slog.i(TAG, "clearUserActivity for " + timeout + "ms from now");
		userActivity(now, timeout, false, OTHER_EVENT, false);
		}

		private void userActivity(long time, long timeoutOverride, boolean noChangeLights,
		int eventType, boolean force) {
		//mContext.enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, null);

		if (((mPokey & POKE_LOCK_IGNORE_CHEEK_EVENTS) != 0)
		@@ -2057,7 +2103,7 @@ class PowerManagerService extends IPowerManager.Stub
		mWakeLockState = mLocks.reactivateScreenLocksLocked();
		setPowerState(mUserState \| mWakeLockState, noChangeLights,
		WindowManagerPolicy.OFF_BECAUSE_OF_USER);
		setTimeoutLocked(time, SCREEN_BRIGHT);
		setTimeoutLocked(time, timeoutOverride, SCREEN_BRIGHT);
		}
		}
		}