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

Commit c2d38ca2 authored by Joy Yoonhyung Lee's avatar Joy Yoonhyung Lee Committed by Automerger Merge Worker
Browse files

Merge "Send showNewUserDisclaimer broadcast when user switching" into main am: 3db71622 

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



Change-Id: I3afdad99de8170b316953ceb815069f0b8ce5fd8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79298b6f 3db71622

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

+5 −5
Original line number Diff line number Diff line
@@ -1114,9 +1114,9 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { 
        }















        @Override













        public void onUserUnlocked(@NonNull TargetUser user) {













            if (user.isPreCreated()) return;













            mService.handleOnUserUnlocked(user.getUserIdentifier());













        public void onUserSwitching(@NonNull TargetUser from, @NonNull TargetUser to) {













            if (to.isPreCreated()) return;













            mService.handleOnUserSwitching(from.getUserIdentifier(), to.getUserIdentifier());















        }















    }
























@@ -3696,8 +3696,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub {













        mDevicePolicyEngine.handleUnlockUser(userId);















    }



























    void handleOnUserUnlocked(int userId) {













        showNewUserDisclaimerIfNecessary(userId);













    void handleOnUserSwitching(int fromUserId, int toUserId) {













        showNewUserDisclaimerIfNecessary(toUserId);















    }





























    void handleStopUser(int userId) {