Merge "Move system server pullers off background thread" into main (15f7885a) · Commits · e / os / android_frameworks_base

apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import static android.content.pm.PackageManager.MATCH_UNINSTALLED_PACKAGES;
		import static android.os.UserHandle.USER_CURRENT;
		import static android.os.UserHandle.USER_NULL;

		import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;
		import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_ID;
		import static com.android.server.blob.BlobStoreConfig.INVALID_BLOB_SIZE;
		import static com.android.server.blob.BlobStoreConfig.LOGV;
		@@ -1915,7 +1916,7 @@ public class BlobStoreManagerService extends SystemService {
		mStatsManager.setPullAtomCallback(
		FrameworkStatsLog.BLOB_INFO,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(),
		DIRECT_EXECUTOR,
		mStatsCallbackImpl
		);
		}

apex/jobscheduler/service/java/com/android/server/alarm/MetricsHelper.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.server.alarm;

		import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;
		import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__ALLOW_LIST;
		import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__CHANGE_DISABLED;
		import static com.android.internal.util.FrameworkStatsLog.ALARM_SCHEDULED__EXACT_ALARM_ALLOWED_REASON__LISTENER;
		@@ -31,7 +32,6 @@ import android.app.StatsManager;
		import android.content.Context;
		import android.os.SystemClock;

		import com.android.internal.os.BackgroundThread;
		import com.android.internal.util.FrameworkStatsLog;

		import java.util.function.Supplier;
		@@ -51,7 +51,7 @@ class MetricsHelper {
		void registerPuller(Supplier<AlarmStore> alarmStoreSupplier) {
		final StatsManager statsManager = mContext.getSystemService(StatsManager.class);
		statsManager.setPullAtomCallback(FrameworkStatsLog.PENDING_ALARM_INFO, null,
		BackgroundThread.getExecutor(), (atomTag, data) -> {
		DIRECT_EXECUTOR, (atomTag, data) -> {
		if (atomTag != FrameworkStatsLog.PENDING_ALARM_INFO) {
		throw new UnsupportedOperationException("Unknown tag" + atomTag);
		}

services/core/java/com/android/server/LogMteState.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -16,11 +16,12 @@

		package com.android.server;

		import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;

		import android.app.StatsManager;
		import android.content.Context;
		import android.util.StatsEvent;

		import com.android.internal.os.BackgroundThread;
		import com.android.internal.os.Zygote;
		import com.android.internal.util.FrameworkStatsLog;

		@@ -32,7 +33,7 @@ public class LogMteState {
		.setPullAtomCallback(
		FrameworkStatsLog.MTE_STATE,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(),
		DIRECT_EXECUTOR,
		new StatsManager.StatsPullAtomCallback() {
		@Override
		public int onPullAtom(int atomTag, List<StatsEvent> data) {

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -27,6 +27,8 @@ import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
		import static android.net.NetworkStack.PERMISSION_MAINLINE_NETWORK_STACK;
		import static android.os.BatteryStats.POWER_DATA_UNAVAILABLE;

		import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;

		import android.annotation.EnforcePermission;
		import android.annotation.NonNull;
		import android.annotation.RequiresNoPermission;
		@@ -94,7 +96,6 @@ import android.util.StatsEvent;
		import com.android.internal.R;
		import com.android.internal.annotations.GuardedBy;
		import com.android.internal.app.IBatteryStats;
		import com.android.internal.os.BackgroundThread;
		import com.android.internal.os.BinderCallsStats;
		import com.android.internal.os.CpuScalingPolicies;
		import com.android.internal.os.CpuScalingPolicyReader;
		@@ -844,15 +845,15 @@ public final class BatteryStatsService extends IBatteryStats.Stub
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(), pullAtomCallback);
		DIRECT_EXECUTOR, pullAtomCallback);
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_SINCE_RESET_USING_POWER_PROFILE_MODEL,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(), pullAtomCallback);
		DIRECT_EXECUTOR, pullAtomCallback);
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.BATTERY_USAGE_STATS_BEFORE_RESET,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(), pullAtomCallback);
		DIRECT_EXECUTOR, pullAtomCallback);
		}

		/** StatsPullAtomCallback for pulling BatteryUsageStats data. */

services/core/java/com/android/server/app/GameManagerService.java

+4 −3

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@ import static com.android.internal.R.styleable.GameModeConfig_allowGameDownscali
		import static com.android.internal.R.styleable.GameModeConfig_allowGameFpsOverride;
		import static com.android.internal.R.styleable.GameModeConfig_supportsBatteryGameMode;
		import static com.android.internal.R.styleable.GameModeConfig_supportsPerformanceGameMode;
		import static com.android.internal.util.ConcurrentUtils.DIRECT_EXECUTOR;

		import android.Manifest;
		import android.annotation.NonNull;
		@@ -2087,17 +2088,17 @@ public final class GameManagerService extends IGameManagerService.Stub {
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.GAME_MODE_INFO,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(),
		DIRECT_EXECUTOR,
		this::onPullAtom);
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.GAME_MODE_CONFIGURATION,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(),
		DIRECT_EXECUTOR,
		this::onPullAtom);
		statsManager.setPullAtomCallback(
		FrameworkStatsLog.GAME_MODE_LISTENER,
		null, // use default PullAtomMetadata values
		BackgroundThread.getExecutor(),
		DIRECT_EXECUTOR,
		this::onPullAtom);
		}