Merge "Log FullBatteryDesignCapacity atom to statsd" into main (81ccd8e4) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+15 −0

Original line number	Diff line number	Diff line
		@@ -808,6 +808,7 @@ public class StatsPullAtomService extends SystemService {
		case FrameworkStatsLog.BATTERY_LEVEL:
		case FrameworkStatsLog.REMAINING_BATTERY_CAPACITY:
		case FrameworkStatsLog.FULL_BATTERY_CAPACITY:
		case FrameworkStatsLog.FULL_BATTERY_DESIGN_CAPACITY:
		case FrameworkStatsLog.BATTERY_VOLTAGE:
		case FrameworkStatsLog.BATTERY_CYCLE_COUNT:
		case FrameworkStatsLog.BATTERY_HEALTH:
		@@ -1045,6 +1046,7 @@ public class StatsPullAtomService extends SystemService {
		registerBatteryLevel();
		registerRemainingBatteryCapacity();
		registerFullBatteryCapacity();
		registerFullBatteryDesignCapacity();
		registerBatteryVoltage();
		registerBatteryCycleCount();
		registerBatteryHealth();
		@@ -4409,6 +4411,16 @@ public class StatsPullAtomService extends SystemService {
		);
		}

		private void registerFullBatteryDesignCapacity() {
		int tagId = FrameworkStatsLog.FULL_BATTERY_DESIGN_CAPACITY;
		mStatsManager.setPullAtomCallback(
		tagId,
		null, // use default PullAtomMetadata values
		DIRECT_EXECUTOR,
		mStatsCallbackImpl
		);
		}

		private void registerBatteryVoltage() {
		int tagId = FrameworkStatsLog.BATTERY_VOLTAGE;
		mStatsManager.setPullAtomCallback(
		@@ -4469,6 +4481,9 @@ public class StatsPullAtomService extends SystemService {
		case FrameworkStatsLog.FULL_BATTERY_CAPACITY:
		pulledValue = healthInfo.batteryFullChargeUah;
		break;
		case FrameworkStatsLog.FULL_BATTERY_DESIGN_CAPACITY:
		pulledValue = healthInfo.batteryFullChargeDesignCapacityUah;
		break;
		case FrameworkStatsLog.BATTERY_VOLTAGE:
		pulledValue = healthInfo.batteryVoltageMillivolts;
		break;