Merge "[BatteryStatsService] Disable deprecated BatteryUsageStatsAtom" into main (fbafb9c1) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+7 −0

Original line number	Diff line number	Diff line
		@@ -1490,6 +1490,13 @@ java_aconfig_library {
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		java_aconfig_library {
		name: "backstage_power_flags_lib-host",
		aconfig_declarations: "backstage_power_flags",
		host_supported: true,
		defaults: ["framework-minus-apex-aconfig-java-defaults"],
		}

		// Dropbox data
		aconfig_declarations {
		name: "dropbox_flags",

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

+26 −12

Original line number	Diff line number	Diff line
		@@ -1104,6 +1104,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		final StatsManager statsManager = mContext.getSystemService(StatsManager.class);
		final StatsPullAtomCallbackImpl pullAtomCallback = new StatsPullAtomCallbackImpl();

		if (!Flags.disableCompositeBatteryUsageStatsAtoms()) {
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET,
		null, // use default PullAtomMetadata values
		@@ -1116,6 +1117,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET,
		null, // use default PullAtomMetadata values
		DIRECT_EXECUTOR, pullAtomCallback);
		}
		if (Flags.addBatteryUsageStatsSliceAtom()) {
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID,
		@@ -1132,6 +1134,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		final BatteryUsageStats bus;
		switch (atomTag) {
		case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET: {
		if (Flags.disableCompositeBatteryUsageStatsAtoms()) {
		return StatsManager.PULL_SKIP;
		}

		@SuppressLint("MissingPermission")
		final double minConsumedPowerThreshold =
		DeviceConfig.getFloat(DEVICE_CONFIG_NAMESPACE,
		@@ -1148,6 +1154,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		break;
		}
		case FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL:
		if (Flags.disableCompositeBatteryUsageStatsAtoms()) {
		return StatsManager.PULL_SKIP;
		}

		final BatteryUsageStatsQuery queryPowerProfile =
		new BatteryUsageStatsQuery.Builder()
		.setMaxStatsAgeMs(0)
		@@ -1159,6 +1169,10 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		bus = getBatteryUsageStats(List.of(queryPowerProfile)).get(0);
		break;
		case FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET: {
		if (Flags.disableCompositeBatteryUsageStatsAtoms()) {
		return StatsManager.PULL_SKIP;
		}

		final long sessionStart =
		getLastBatteryUsageStatsBeforeResetAtomPullTimestamp();
		final long sessionEnd;

services/core/java/com/android/server/power/stats/flags.aconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -61,3 +61,10 @@ flag {
		description: "Batterystats dumpsys is enhanced by including power break-down by power s"
		bug: "352835319"
		}

		flag {
		name: "disable_composite_battery_usage_stats_atoms"
		namespace: "backstage_power"
		description: "Disable deprecated BatteryUsageStatsAtom pulled atom"
		bug: "324602949"
		}