Merge "Removed @Deprecated SystemService callback methods that take a userId." (46a03540) · Commits · e / os / android_frameworks_base

apex/jobscheduler/service/java/com/android/server/job/JobSchedulerService.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ import com.android.server.AppStateTracker;
		import com.android.server.AppStateTrackerImpl;
		import com.android.server.DeviceIdleInternal;
		import com.android.server.LocalServices;
		import com.android.server.SystemService.TargetUser;
		import com.android.server.job.JobSchedulerServiceDumpProto.ActiveJob;
		import com.android.server.job.JobSchedulerServiceDumpProto.PendingJob;
		import com.android.server.job.controllers.BackgroundJobsController;
		@@ -975,24 +976,24 @@ public class JobSchedulerService extends com.android.server.SystemService
		}

		@Override
		public void onStartUser(int userHandle) {
		public void onUserStarting(@NonNull TargetUser user) {
		synchronized (mLock) {
		mStartedUsers = ArrayUtils.appendInt(mStartedUsers, userHandle);
		mStartedUsers = ArrayUtils.appendInt(mStartedUsers, user.getUserIdentifier());
		}
		// Let's kick any outstanding jobs for this user.
		mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
		}

		@Override
		public void onUnlockUser(int userHandle) {
		public void onUserUnlocking(@NonNull TargetUser user) {
		// Let's kick any outstanding jobs for this user.
		mHandler.obtainMessage(MSG_CHECK_JOB).sendToTarget();
		}

		@Override
		public void onStopUser(int userHandle) {
		public void onUserStopping(@NonNull TargetUser user) {
		synchronized (mLock) {
		mStartedUsers = ArrayUtils.removeInt(mStartedUsers, userHandle);
		mStartedUsers = ArrayUtils.removeInt(mStartedUsers, user.getUserIdentifier());
		}
		}

+7 −5

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

		package com.android.server.appwidget;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.content.Context;

		import com.android.server.AppWidgetBackupBridge;
		import com.android.server.FgThread;
		import com.android.server.SystemService;
		import com.android.server.SystemService.TargetUser;

		/**
		* SystemService that publishes an IAppWidgetService.
		@@ -49,12 +51,12 @@ public class AppWidgetService extends SystemService {
		}

		@Override
		public void onStopUser(int userHandle) {
		mImpl.onUserStopped(userHandle);
		public void onUserStopping(@NonNull TargetUser user) {
		mImpl.onUserStopped(user.getUserIdentifier());
		}

		@Override
		public void onSwitchUser(int userHandle) {
		mImpl.reloadWidgetsMaskedStateForGroup(userHandle);
		public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
		mImpl.reloadWidgetsMaskedStateForGroup(to.getUserIdentifier());
		}
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@ import com.android.internal.util.Preconditions;
		import com.android.internal.util.SyncResultReceiver;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.SystemService.TargetUser;
		import com.android.server.autofill.ui.AutoFillUI;
		import com.android.server.infra.AbstractMasterSystemService;
		import com.android.server.infra.FrameworkResourcesServiceNameResolver;
		@@ -363,7 +364,7 @@ public final class AutofillManagerService
		}

		@Override // from SystemService
		public void onSwitchUser(int userHandle) {
		public void onUserSwitching(@Nullable TargetUser from, @NonNull TargetUser to) {
		if (sDebug) Slog.d(TAG, "Hiding UI when user switched");
		mUi.hideAll(null);
		}

+6 −4

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ package com.android.server.backup;
		import static java.util.Collections.emptySet;

		import android.Manifest;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.app.ActivityManager;
		@@ -60,6 +61,7 @@ import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.util.DumpUtils;
		import com.android.server.SystemConfig;
		import com.android.server.SystemService;
		import com.android.server.SystemService.TargetUser;
		import com.android.server.backup.utils.RandomAccessFileUtils;

		import java.io.File;
		@@ -1605,13 +1607,13 @@ public class BackupManagerService extends IBackupManager.Stub {
		}

		@Override
		public void onUnlockUser(int userId) {
		sInstance.onUnlockUser(userId);
		public void onUserUnlocking(@NonNull TargetUser user) {
		sInstance.onUnlockUser(user.getUserIdentifier());
		}

		@Override
		public void onStopUser(int userId) {
		sInstance.onStopUser(userId);
		public void onUserStopping(@NonNull TargetUser user) {
		sInstance.onStopUser(user.getUserIdentifier());
		}

		@VisibleForTesting

+4 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import static com.android.internal.util.function.pooled.PooledLambda.obtainRunna
		import static java.util.concurrent.TimeUnit.MINUTES;

		import android.annotation.CheckResult;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.app.AppOpsManager;
		import android.app.PendingIntent;
		@@ -84,6 +85,7 @@ import com.android.internal.util.function.pooled.PooledLambda;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.SystemService;
		import com.android.server.SystemService.TargetUser;
		import com.android.server.wm.ActivityTaskManagerInternal;

		import org.xmlpull.v1.XmlPullParser;
		@@ -189,7 +191,8 @@ public class CompanionDeviceManagerService extends SystemService implements Bind
		}

		@Override
		public void onUnlockUser(int userHandle) {
		public void onUserUnlocking(@NonNull TargetUser user) {
		int userHandle = user.getUserIdentifier();
		Set<Association> associations = readAllAssociations(userHandle);
		if (associations == null \|\| associations.isEmpty()) {
		return;