Merge "Hack to get devices booting again." into mnc-dr1.5-dev (29700949) · Commits · e / os / android_frameworks_base

services/usage/java/com/android/server/usage/UsageStatsService.java

+13 −1

Original line number	Original line	Diff line number	Diff line
	@@ -145,6 +145,8 @@ public class UsageStatsService extends SystemService implements
	private boolean mScreenOn;		private boolean mScreenOn;
	private long mLastAppIdleParoledTime;		private long mLastAppIdleParoledTime;

			private volatile boolean mPendingOneTimeCheckIdleStates;

	long mScreenOnTime;		long mScreenOnTime;
	long mLastScreenOnEventRealtime;		long mLastScreenOnEventRealtime;

	@@ -221,6 +223,10 @@ public class UsageStatsService extends SystemService implements
	synchronized (this) {		synchronized (this) {
	updateDisplayLocked();		updateDisplayLocked();
	}		}

			if (mPendingOneTimeCheckIdleStates) {
			postOneTimeCheckIdleStates();
			}
	} else if (phase == PHASE_BOOT_COMPLETED) {		} else if (phase == PHASE_BOOT_COMPLETED) {
	setAppIdleParoled(getContext().getSystemService(BatteryManager.class).isCharging());		setAppIdleParoled(getContext().getSystemService(BatteryManager.class).isCharging());
	}		}
	@@ -368,7 +374,13 @@ public class UsageStatsService extends SystemService implements
	* scheduling a series of repeating checkIdleStates each time we fired off one.		* scheduling a series of repeating checkIdleStates each time we fired off one.
	*/		*/
	void postOneTimeCheckIdleStates() {		void postOneTimeCheckIdleStates() {
			if (mDeviceIdleController == null) {
			// Not booted yet; wait for it!
			mPendingOneTimeCheckIdleStates = true;
			} else {
	mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);		mHandler.sendEmptyMessage(MSG_ONE_TIME_CHECK_IDLE_STATES);
			mPendingOneTimeCheckIdleStates = false;
			}
	}		}

	/** Check all running users' or specified user's apps to see if they enter an idle state. */		/** Check all running users' or specified user's apps to see if they enter an idle state. */