Merge "Send showNewUserDisclaimer broadcast when user switching" into main (8c0f2400) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -1131,9 +1131,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());
		}
		}

		@@ -3831,8 +3831,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) {