Merge "Revert "Fix StrictMode I/O violations"" (da71266f) · Commits · e / os / android_frameworks_base

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

+7 −15

Original line number	Diff line number	Diff line
		@@ -89,7 +89,6 @@ import com.android.internal.logging.MetricsLogger;
		import com.android.internal.util.ArrayUtils;
		import com.android.internal.util.Preconditions;
		import com.android.internal.widget.LockPatternUtils;
		import com.android.server.FgThread;
		import com.android.server.LocalServices;
		import com.android.server.SystemServiceManager;
		import com.android.server.pm.UserManagerService;
		@@ -370,9 +369,6 @@ class UserController implements Handler.Callback {
		// Prepare app storage before we go any further
		uss.mUnlockProgress.setProgress(5,
		mInjector.getContext().getString(R.string.android_start_title));

		// Call onBeforeUnlockUser on a worker thread that allows disk I/O
		FgThread.getHandler().post(() -> {
		mInjector.getUserManager().onBeforeUnlockUser(userId);
		uss.mUnlockProgress.setProgress(20);

		@@ -380,7 +376,6 @@ class UserController implements Handler.Callback {
		// that calls through to the next "unlocked" phase
		mHandler.obtainMessage(SYSTEM_USER_UNLOCK_MSG, userId, 0, uss)
		.sendToTarget();
		});
		}

		/**
		@@ -1824,10 +1819,7 @@ class UserController implements Handler.Callback {
		case SYSTEM_USER_UNLOCK_MSG:
		final int userId = msg.arg1;
		mInjector.getSystemServiceManager().unlockUser(userId);
		// Loads recents on a worker thread that allows disk I/O
		FgThread.getHandler().post(() -> {
		mInjector.loadUserRecents(userId);
		});
		if (userId == UserHandle.USER_SYSTEM) {
		mInjector.startPersistentApps(PackageManager.MATCH_DIRECT_BOOT_UNAWARE);
		}