Merge "Truncate user data to a limit of 500 characters" into rvc-dev (a4ddc2b3) · Commits · e / os / android_frameworks_base

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

+20 −7

Original line number	Diff line number	Diff line
		@@ -239,6 +239,8 @@ public class UserManagerService extends IUserManager.Stub {

		private static final int USER_VERSION = 9;

		private static final int MAX_USER_STRING_LENGTH = 500;

		private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // ms

		static final int WRITE_USER_MSG = 1;
		@@ -2908,15 +2910,17 @@ public class UserManagerService extends IUserManager.Stub {
		// Write seed data
		if (userData.persistSeedData) {
		if (userData.seedAccountName != null) {
		serializer.attribute(null, ATTR_SEED_ACCOUNT_NAME, userData.seedAccountName);
		serializer.attribute(null, ATTR_SEED_ACCOUNT_NAME,
		truncateString(userData.seedAccountName));
		}
		if (userData.seedAccountType != null) {
		serializer.attribute(null, ATTR_SEED_ACCOUNT_TYPE, userData.seedAccountType);
		serializer.attribute(null, ATTR_SEED_ACCOUNT_TYPE,
		truncateString(userData.seedAccountType));
		}
		}
		if (userInfo.name != null) {
		serializer.startTag(null, TAG_NAME);
		serializer.text(userInfo.name);
		serializer.text(truncateString(userInfo.name));
		serializer.endTag(null, TAG_NAME);
		}
		synchronized (mRestrictionsLock) {
		@@ -2956,6 +2960,13 @@ public class UserManagerService extends IUserManager.Stub {
		serializer.endDocument();
		}

		private String truncateString(String original) {
		if (original == null \|\| original.length() <= MAX_USER_STRING_LENGTH) {
		return original;
		}
		return original.substring(0, MAX_USER_STRING_LENGTH);
		}

		/*
		* Writes the user list file in this format:
		*
		@@ -3365,6 +3376,7 @@ public class UserManagerService extends IUserManager.Stub {
		@NonNull String userType, @UserInfoFlag int flags, @UserIdInt int parentId,
		boolean preCreate, @Nullable String[] disallowedPackages,
		@NonNull TimingsTraceAndSlog t) throws UserManager.CheckedUserOperationException {
		String truncatedName = truncateString(name);
		final UserTypeDetails userTypeDetails = mUserTypes.get(userType);
		if (userTypeDetails == null) {
		Slog.e(LOG_TAG, "Cannot create user of invalid user type: " + userType);
		@@ -3390,7 +3402,8 @@ public class UserManagerService extends IUserManager.Stub {

		// Try to use a pre-created user (if available).
		if (!preCreate && parentId < 0 && isUserTypeEligibleForPreCreation(userTypeDetails)) {
		final UserInfo preCreatedUser = convertPreCreatedUserIfPossible(userType, flags, name);
		final UserInfo preCreatedUser = convertPreCreatedUserIfPossible(userType, flags,
		truncatedName);
		if (preCreatedUser != null) {
		return preCreatedUser;
		}
		@@ -3482,7 +3495,7 @@ public class UserManagerService extends IUserManager.Stub {
		flags &= ~UserInfo.FLAG_EPHEMERAL;
		}

		userInfo = new UserInfo(userId, name, null, flags, userType);
		userInfo = new UserInfo(userId, truncatedName, null, flags, userType);
		userInfo.serialNumber = mNextSerialNumber++;
		userInfo.creationTime = getCreationTime();
		userInfo.partial = true;
		@@ -4552,8 +4565,8 @@ public class UserManagerService extends IUserManager.Stub {
		Slog.e(LOG_TAG, "No such user for settings seed data u=" + userId);
		return;
		}
		userData.seedAccountName = accountName;
		userData.seedAccountType = accountType;
		userData.seedAccountName = truncateString(accountName);
		userData.seedAccountType = truncateString(accountType);
		userData.seedAccountOptions = accountOptions;
		userData.persistSeedData = persist;
		}