Ignore errors preparing user storage for existing users am: e667b60402 (8ea6cb03) · Commits · e / os / android_frameworks_base

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

+10 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3397,11 +3397,20 @@ class StorageManagerService extends IStorageManager.Stub
	mInstaller.tryMountDataMirror(volumeUuid);		mInstaller.tryMountDataMirror(volumeUuid);
	}		}
	}		}
	} catch (RemoteException \| Installer.InstallerException e) {		} catch (Exception e) {
	Slog.wtf(TAG, e);		Slog.wtf(TAG, e);
	// Make sure to re-throw this exception; we must not ignore failure		// Make sure to re-throw this exception; we must not ignore failure
	// to prepare the user storage as it could indicate that encryption		// to prepare the user storage as it could indicate that encryption
	// wasn't successfully set up.		// wasn't successfully set up.
			//
			// Very unfortunately, these errors need to be ignored for broken
			// users that already existed on-disk from older Android versions.
			UserManagerInternal umInternal = LocalServices.getService(UserManagerInternal.class);
			if (umInternal.shouldIgnorePrepareStorageErrors(userId)) {
			Slog.wtf(TAG, "ignoring error preparing storage for existing user " + userId
			+ "; device may be insecure!");
			return;
			}
	throw new RuntimeException(e);		throw new RuntimeException(e);
	}		}
	}		}

services/core/java/com/android/server/pm/UserManagerInternal.java

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -312,4 +312,12 @@ public abstract class UserManagerInternal {
	*/		*/
	public abstract void setDefaultCrossProfileIntentFilters(		public abstract void setDefaultCrossProfileIntentFilters(
	@UserIdInt int parentUserId, @UserIdInt int profileUserId);		@UserIdInt int parentUserId, @UserIdInt int profileUserId);

			/**
			* Returns {@code true} if the system should ignore errors when preparing
			* the storage directories for the user with ID {@code userId}. This will
			* return {@code false} for all new users; it will only return {@code true}
			* for users that already existed on-disk from an older version of Android.
			*/
			public abstract boolean shouldIgnorePrepareStorageErrors(int userId);
	}		}

services/core/java/com/android/server/pm/UserManagerService.java

+42 −0

Original line number	Original line	Diff line number	Diff line
	@@ -203,6 +203,8 @@ public class UserManagerService extends IUserManager.Stub {
	private static final String TAG_SEED_ACCOUNT_OPTIONS = "seedAccountOptions";		private static final String TAG_SEED_ACCOUNT_OPTIONS = "seedAccountOptions";
	private static final String TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL =		private static final String TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL =
	"lastRequestQuietModeEnabledCall";		"lastRequestQuietModeEnabledCall";
			private static final String TAG_IGNORE_PREPARE_STORAGE_ERRORS =
			"ignorePrepareStorageErrors";
	private static final String ATTR_KEY = "key";		private static final String ATTR_KEY = "key";
	private static final String ATTR_VALUE_TYPE = "type";		private static final String ATTR_VALUE_TYPE = "type";
	private static final String ATTR_MULTIPLE = "m";		private static final String ATTR_MULTIPLE = "m";
	@@ -312,6 +314,14 @@ public class UserManagerService extends IUserManager.Stub {

	private long mLastRequestQuietModeEnabledMillis;		private long mLastRequestQuietModeEnabledMillis;

			/**
			* {@code true} if the system should ignore errors when preparing the
			* storage directories for this user. This is {@code false} for all new
			* users; it will only be {@code true} for users that already existed
			* on-disk from an older version of Android.
			*/
			private boolean mIgnorePrepareStorageErrors;

	void setLastRequestQuietModeEnabledMillis(long millis) {		void setLastRequestQuietModeEnabledMillis(long millis) {
	mLastRequestQuietModeEnabledMillis = millis;		mLastRequestQuietModeEnabledMillis = millis;
	}		}
	@@ -320,6 +330,14 @@ public class UserManagerService extends IUserManager.Stub {
	return mLastRequestQuietModeEnabledMillis;		return mLastRequestQuietModeEnabledMillis;
	}		}

			boolean getIgnorePrepareStorageErrors() {
			return mIgnorePrepareStorageErrors;
			}

			void setIgnorePrepareStorageErrors() {
			mIgnorePrepareStorageErrors = true;
			}

	void clearSeedAccountData() {		void clearSeedAccountData() {
	seedAccountName = null;		seedAccountName = null;
	seedAccountType = null;		seedAccountType = null;
	@@ -3176,6 +3194,10 @@ public class UserManagerService extends IUserManager.Stub {
	serializer.endTag(/* namespace */ null, TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL);		serializer.endTag(/* namespace */ null, TAG_LAST_REQUEST_QUIET_MODE_ENABLED_CALL);
	}		}

			serializer.startTag(/* namespace */ null, TAG_IGNORE_PREPARE_STORAGE_ERRORS);
			serializer.text(String.valueOf(userData.getIgnorePrepareStorageErrors()));
			serializer.endTag(/* namespace */ null, TAG_IGNORE_PREPARE_STORAGE_ERRORS);

	serializer.endTag(null, TAG_USER);		serializer.endTag(null, TAG_USER);

	serializer.endDocument();		serializer.endDocument();
	@@ -3285,6 +3307,7 @@ public class UserManagerService extends IUserManager.Stub {
	Bundle legacyLocalRestrictions = null;		Bundle legacyLocalRestrictions = null;
	RestrictionsSet localRestrictions = null;		RestrictionsSet localRestrictions = null;
	Bundle globalRestrictions = null;		Bundle globalRestrictions = null;
			boolean ignorePrepareStorageErrors = true; // default is true for old users

	final TypedXmlPullParser parser = Xml.resolvePullParser(is);		final TypedXmlPullParser parser = Xml.resolvePullParser(is);
	int type;		int type;
	@@ -3363,6 +3386,11 @@ public class UserManagerService extends IUserManager.Stub {
	if (type == XmlPullParser.TEXT) {		if (type == XmlPullParser.TEXT) {
	lastRequestQuietModeEnabledTimestamp = Long.parseLong(parser.getText());		lastRequestQuietModeEnabledTimestamp = Long.parseLong(parser.getText());
	}		}
			} else if (TAG_IGNORE_PREPARE_STORAGE_ERRORS.equals(tag)) {
			type = parser.next();
			if (type == XmlPullParser.TEXT) {
			ignorePrepareStorageErrors = Boolean.parseBoolean(parser.getText());
			}
	}		}
	}		}
	}		}
	@@ -3390,6 +3418,9 @@ public class UserManagerService extends IUserManager.Stub {
	userData.persistSeedData = persistSeedData;		userData.persistSeedData = persistSeedData;
	userData.seedAccountOptions = seedAccountOptions;		userData.seedAccountOptions = seedAccountOptions;
	userData.setLastRequestQuietModeEnabledMillis(lastRequestQuietModeEnabledTimestamp);		userData.setLastRequestQuietModeEnabledMillis(lastRequestQuietModeEnabledTimestamp);
			if (ignorePrepareStorageErrors) {
			userData.setIgnorePrepareStorageErrors();
			}

	synchronized (mRestrictionsLock) {		synchronized (mRestrictionsLock) {
	if (baseRestrictions != null) {		if (baseRestrictions != null) {
	@@ -5227,6 +5258,9 @@ public class UserManagerService extends IUserManager.Stub {
	pw.println();		pw.println();
	}		}
	}		}

			pw.println(" Ignore errors preparing storage: "
			+ userData.getIgnorePrepareStorageErrors());
	}		}
	}		}

	@@ -5716,6 +5750,14 @@ public class UserManagerService extends IUserManager.Stub {
	UserManagerService.this.setDefaultCrossProfileIntentFilters(		UserManagerService.this.setDefaultCrossProfileIntentFilters(
	profileUserId, userTypeDetails, restrictions, parentUserId);		profileUserId, userTypeDetails, restrictions, parentUserId);
	}		}

			@Override
			public boolean shouldIgnorePrepareStorageErrors(int userId) {
			synchronized (mUsersLock) {
			UserData userData = mUsers.get(userId);
			return userData != null && userData.getIgnorePrepareStorageErrors();
			}
			}
	}		}

	/**		/**