From 22fd61a7f2a7b04f55ac1177aa52d8b63a90af5b Mon Sep 17 00:00:00 2001 From: Robert Chou Date: Wed, 20 Mar 2024 12:37:33 +0800 Subject: Revert Fix security vulnerability that creates user with no restrictions when accountOptions are too long. Bug: 293602970 Test: atest UserManagerTest#testAddUserAccountData_validStringValuesAreSaved_validBundleIsSaved && atest UserManagerTest#testAddUserAccountData_invalidStringValuesAreTruncated_invalidBundleIsDropped (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8dc6feaee7c0a5cea093b5280acaad862921cf3e) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d6e2e4025e3b39bad82e2ae3113b3606048d03d) Merged-In: Ia77fde1cb6158446423240e4ff711b1b35fa648f Change-Id: Ia77fde1cb6158446423240e4ff711b1b35fa648f --- core/java/android/os/UserManager.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 5382c995fb53..ce790ae6646e 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -115,21 +115,6 @@ public class UserManager { */ public static final int MAX_ACCOUNT_OPTIONS_LENGTH = 1000; - /** Maximum length of username. - * @hide - */ - public static final int MAX_USER_NAME_LENGTH = 100; - - /** Maximum length of user property String value. - * @hide - */ - public static final int MAX_ACCOUNT_STRING_LENGTH = 500; - - /** Maximum length of account options String values. - * @hide - */ - public static final int MAX_ACCOUNT_OPTIONS_LENGTH = 1000; - /** * User type representing a {@link UserHandle#USER_SYSTEM system} user that is a human user. * This type of user cannot be created; it can only pre-exist on first boot. -- cgit v1.2.3