Merge "Move RPM stats collection out of BatteryStatsImpl.mLock" into sc-dev (42f68a76) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/os/BatteryStatsImpl.java

+21 −6

Original line number	Diff line number	Diff line
		@@ -275,7 +275,7 @@ public class BatteryStatsImpl extends BatteryStats {
		private int mNumAllUidCpuTimeReads;

		/** Container for Resource Power Manager stats. Updated by updateRpmStatsLocked. */
		private final RpmStats mTmpRpmStats = new RpmStats();
		private RpmStats mTmpRpmStats = null;
		/** The soonest the RPM stats can be updated after it was last updated. */
		private static final long RPM_STATS_UPDATE_FREQ_MS = 1000;
		/** Last time that RPM stats were updated by updateRpmStatsLocked. */
		@@ -12387,19 +12387,34 @@ public class BatteryStatsImpl extends BatteryStats {

		mLastBluetoothActivityInfo.set(info);
		}

		/**
		* Read and record Resource Power Manager (RPM) state and voter times.
		* Read Resource Power Manager (RPM) state and voter times.
		* If RPM stats were fetched more recently than RPM_STATS_UPDATE_FREQ_MS ago, uses the old data
		* instead of fetching it anew.
		*
		* Note: This should be called without synchronizing this BatteryStatsImpl object
		*/
		public void updateRpmStatsLocked(long elapsedRealtimeUs) {
		public void fillLowPowerStats() {
		if (mPlatformIdleStateCallback == null) return;

		RpmStats rpmStats = new RpmStats();
		long now = SystemClock.elapsedRealtime();
		if (now - mLastRpmStatsUpdateTimeMs >= RPM_STATS_UPDATE_FREQ_MS) {
		mPlatformIdleStateCallback.fillLowPowerStats(mTmpRpmStats);
		mPlatformIdleStateCallback.fillLowPowerStats(rpmStats);
		synchronized (this) {
		mTmpRpmStats = rpmStats;
		mLastRpmStatsUpdateTimeMs = now;
		}
		}
		}

		/**
		* Record Resource Power Manager (RPM) state and voter times.
		* TODO(b/185252376): Remove this logging. PowerStatsService logs the same data more
		* efficiently.
		*/
		public void updateRpmStatsLocked(long elapsedRealtimeUs) {
		if (mTmpRpmStats == null) return;

		for (Map.Entry<String, RpmStats.PowerStatePlatformSleepState> pstate
		: mTmpRpmStats.mPlatformLowPowerStats.entrySet()) {

services/core/java/com/android/server/am/BatteryExternalStatsWorker.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -579,6 +579,9 @@ class BatteryExternalStatsWorker implements BatteryStatsImpl.ExternalStatsSync {
		}
		}

		// Collect the latest low power stats without holding the mStats lock.
		mStats.fillLowPowerStats();

		final WifiActivityEnergyInfo wifiInfo = awaitControllerInfo(wifiReceiver);
		final BluetoothActivityEnergyInfo bluetoothInfo = awaitControllerInfo(bluetoothReceiver);
		ModemActivityInfo modemInfo = null;