Merge "Flag cleanup AddBatteryUsageStatsSliceAtom" into main (5613a957) · Commits · e / os / android_frameworks_base

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

+7 −13

Original line number	Diff line number	Diff line
		@@ -959,7 +959,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		null, // use default PullAtomMetadata values
		DIRECT_EXECUTOR, pullAtomCallback);
		}
		if (Flags.addBatteryUsageStatsSliceAtom()) {
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID,
		new StatsManager.PullAtomMetadata.Builder()
		@@ -968,7 +967,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		DIRECT_EXECUTOR,
		pullAtomCallback);
		}
		}

		/** StatsPullAtomCallback for pulling BatteryUsageStats data. */
		private class StatsPullAtomCallbackImpl implements StatsManager.StatsPullAtomCallback {
		@@ -1025,10 +1023,6 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		break;
		}
		case FrameworkStatsLog.BATTERY_USAGE_STATS_PER_UID: {
		if (!Flags.addBatteryUsageStatsSliceAtom()) {
		return StatsManager.PULL_SKIP;
		}

		@SuppressLint("MissingPermission")
		final double minConsumedPowerThreshold =
		DeviceConfig.getFloat(

+0 −7

Original line number	Diff line number	Diff line
		@@ -17,13 +17,6 @@ flag {
		is_exported: true
		}

		flag {
		name: "add_battery_usage_stats_slice_atom"
		namespace: "backstage_power"
		description: "Adds battery_usage_stats_slice atom"
		bug: "324602949"
		}

		flag {
		name: "disable_composite_battery_usage_stats_atoms"
		namespace: "backstage_power"