Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be170ca4 authored by Ayush Sharma's avatar Ayush Sharma Committed by Automerger Merge Worker
Browse files

Merge "Truncate profile name in setProfileName api" into tm-qpr-dev am:... 

Merge "Truncate profile name in setProfileName api" into tm-qpr-dev am: 775a0c63 am: 56be911f am: be2a3745

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22475227



Change-Id: Ib64d14dd9365f64dea5babbe7769d997e34b8407
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d299414 be2a3745

core/java/android/app/admin/DevicePolicyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -9634,7 +9634,8 @@ public class DevicePolicyManager { 
     * @see #isProfileOwnerApp

     * @see #isDeviceOwnerApp

     * @param admin Which {@link DeviceAdminReceiver} this request is associate with.

     * @param profileName The name of the profile.

     * @param profileName The name of the profile. If the name is longer than 200 characters

     *                    it will be truncated.

     * @throws SecurityException if {@code admin} is not a device or profile owner.

     */

    public void setProfileName(@NonNull ComponentName admin, String profileName) {

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+5 −1
Original line number Diff line number Diff line
@@ -563,6 +563,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 














    private static final int REQUEST_PROFILE_OFF_DEADLINE = 5572;



























    private static final int MAX_PROFILE_NAME_LENGTH = 200;



























    private static final long MS_PER_DAY = TimeUnit.DAYS.toMillis(1);





























    private static final long EXPIRATION_GRACE_PERIOD_MS = 5 * MS_PER_DAY; // 5 days, in ms










@@ -10380,8 +10382,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        Preconditions.checkCallAuthorization(















                isDefaultDeviceOwner(caller) || isProfileOwner(caller));



























        final String truncatedProfileName =













                profileName.substring(0, Math.min(profileName.length(), MAX_PROFILE_NAME_LENGTH));















        mInjector.binderWithCleanCallingIdentity(() -> {













            mUserManager.setUserName(caller.getUserId(), profileName);













            mUserManager.setUserName(caller.getUserId(), truncatedProfileName);















            DevicePolicyEventLogger















                    .createEvent(DevicePolicyEnums.SET_PROFILE_NAME)















                    .setAdmin(caller.getComponentName())