Merge "Remove dependency on hidden APIs (5/n)" (27f79175) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/rollback/Rollback.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@ import android.content.IntentSender;
		import android.content.pm.PackageInstaller;
		import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.UserInfo;
		import android.content.pm.VersionedPackage;
		import android.content.rollback.PackageRollbackInfo;
		import android.content.rollback.RollbackInfo;
		@@ -619,9 +618,10 @@ class Rollback {

		Intent broadcast = new Intent(Intent.ACTION_ROLLBACK_COMMITTED);

		for (UserInfo userInfo : UserManager.get(context).getUsers(true)) {
		UserManager userManager = context.getSystemService(UserManager.class);
		for (UserHandle user : userManager.getUserHandles(true)) {
		context.sendBroadcastAsUser(broadcast,
		userInfo.getUserHandle(),
		user,
		Manifest.permission.MANAGE_ROLLBACKS);
		}
		}

services/core/java/com/android/server/rollback/RollbackManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ public final class RollbackManagerService extends SystemService {
		}

		@Override
		public void onUnlockUser(int user) {
		mService.onUnlockUser(user);
		public void onUserUnlocking(TargetUser user) {
		mService.onUnlockUser(user.getUserHandle().getIdentifier());
		}

		@Override

services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java

+11 −10

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@ import android.content.pm.PackageManager;
		import android.content.pm.PackageManagerInternal;
		import android.content.pm.PackageParser;
		import android.content.pm.ParceledListSlice;
		import android.content.pm.UserInfo;
		import android.content.pm.VersionedPackage;
		import android.content.pm.parsing.ApkLiteParseUtils;
		import android.content.pm.parsing.result.ParseResult;
		@@ -160,7 +159,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
		private final RollbackStore mRollbackStore;

		private final Context mContext;
		private final HandlerThread mHandlerThread;
		private final Handler mHandler;
		private final Executor mExecutor;
		private final Installer mInstaller;
		private final RollbackPackageHealthObserver mPackageHealthObserver;
		@@ -205,13 +204,15 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
		}

		// Kick off and start monitoring the handler thread.
		mHandlerThread = new HandlerThread("RollbackManagerServiceHandler");
		mHandlerThread.start();
		HandlerThread handlerThread = new HandlerThread("RollbackManagerServiceHandler");
		handlerThread.start();
		mHandler = new Handler(handlerThread.getLooper());
		Watchdog.getInstance().addThread(getHandler(), HANDLER_THREAD_TIMEOUT_DURATION_MILLIS);
		mExecutor = new HandlerExecutor(getHandler());

		for (UserInfo userInfo : UserManager.get(mContext).getUsers(true)) {
		registerUserCallbacks(userInfo.getUserHandle());
		UserManager userManager = mContext.getSystemService(UserManager.class);
		for (UserHandle user : userManager.getUserHandles(true)) {
		registerUserCallbacks(user);
		}

		IntentFilter enableRollbackFilter = new IntentFilter();
		@@ -317,11 +318,11 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
		}

		private void assertInWorkerThread() {
		Preconditions.checkState(mHandlerThread.getLooper().isCurrentThread());
		Preconditions.checkState(getHandler().getLooper().isCurrentThread());
		}

		private void assertNotInWorkerThread() {
		Preconditions.checkState(!mHandlerThread.getLooper().isCurrentThread());
		Preconditions.checkState(!getHandler().getLooper().isCurrentThread());
		}

		@AnyThread
		@@ -739,7 +740,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba

		@AnyThread
		private Handler getHandler() {
		return mHandlerThread.getThreadHandler();
		return mHandler;
		}

		@AnyThread
		@@ -1321,7 +1322,7 @@ class RollbackManagerServiceImpl extends IRollbackManager.Stub implements Rollba
		int rollbackId = allocateRollbackId();
		final int userId;
		if (parentSession.getUser() == UserHandle.ALL) {
		userId = UserHandle.USER_SYSTEM;
		userId = UserHandle.SYSTEM.getIdentifier();
		} else {
		userId = parentSession.getUser().getIdentifier();
		}

services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ public final class RollbackPackageHealthObserver implements PackageHealthObserve
		mContext = context;
		HandlerThread handlerThread = new HandlerThread("RollbackPackageHealthObserver");
		handlerThread.start();
		mHandler = handlerThread.getThreadHandler();
		mHandler = new Handler(handlerThread.getLooper());
		File dataDir = new File(Environment.getDataDirectory(), "rollback-observer");
		dataDir.mkdirs();
		mLastStagedRollbackIdsFile = new File(dataDir, "last-staged-rollback-ids");

services/core/java/com/android/server/rollback/RollbackStore.java

+2 −3

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

		package com.android.server.rollback;

		import static android.os.UserHandle.USER_SYSTEM;

		import static com.android.server.rollback.Rollback.rollbackStateFromString;

		import android.annotation.NonNull;
		@@ -26,6 +24,7 @@ import android.content.pm.VersionedPackage;
		import android.content.rollback.PackageRollbackInfo;
		import android.content.rollback.PackageRollbackInfo.RestoreInfo;
		import android.content.rollback.RollbackInfo;
		import android.os.UserHandle;
		import android.util.Slog;
		import android.util.SparseIntArray;
		import android.util.SparseLongArray;
		@@ -340,7 +339,7 @@ class RollbackStore {
		rollbackStateFromString(dataJson.getString("state")),
		dataJson.getInt("apkSessionId"),
		dataJson.getBoolean("restoreUserDataInProgress"),
		dataJson.optInt("userId", USER_SYSTEM),
		dataJson.optInt("userId", UserHandle.SYSTEM.getIdentifier()),
		dataJson.optString("installerPackageName", ""),
		extensionVersionsFromJson(dataJson.optJSONArray("extensionVersions")));
		}