diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 71d4ab43db02..e382d071a08a 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -3585,10 +3585,11 @@ public class DevicePolicyManager { @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES) + @UserHandleAware public void acknowledgeNewUserDisclaimer() { if (mService != null) { try { - mService.acknowledgeNewUserDisclaimer(); + mService.acknowledgeNewUserDisclaimer(mContext.getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -3596,17 +3597,18 @@ public class DevicePolicyManager { } /** - * Checks whether the new managed user disclaimer was viewed by the current user. + * Checks whether the new managed user disclaimer was viewed by the user. * * @hide */ @RequiresPermission(anyOf = {android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) @TestApi + @UserHandleAware public boolean isNewUserDisclaimerAcknowledged() { if (mService != null) { try { - return mService.isNewUserDisclaimerAcknowledged(); + return mService.isNewUserDisclaimerAcknowledged(mContext.getUserId()); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 0e1caca2670a..eedc042607be 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -271,8 +271,8 @@ interface IDevicePolicyManager { int logoutUserInternal(); // AIDL doesn't allow overloading name (logoutUser()) int getLogoutUserId(); List<UserHandle> getSecondaryUsers(in ComponentName who); - void acknowledgeNewUserDisclaimer(); - boolean isNewUserDisclaimerAcknowledged(); + void acknowledgeNewUserDisclaimer(int userId); + boolean isNewUserDisclaimerAcknowledged(int userId); void enableSystemApp(in ComponentName admin, in String callerPackage, in String packageName); int enableSystemAppWithIntent(in ComponentName admin, in String callerPackage, in Intent intent); diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index ebfa2c6d85ea..80011d172ad0 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -10982,13 +10982,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public void acknowledgeNewUserDisclaimer() { + public void acknowledgeNewUserDisclaimer(@UserIdInt int userId) { CallerIdentity callerIdentity = getCallerIdentity(); Preconditions.checkCallAuthorization(canManageUsers(callerIdentity) || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); - setShowNewUserDisclaimer(callerIdentity.getUserId(), - DevicePolicyData.NEW_USER_DISCLAIMER_ACKNOWLEDGED); + setShowNewUserDisclaimer(userId, DevicePolicyData.NEW_USER_DISCLAIMER_ACKNOWLEDGED); } private void setShowNewUserDisclaimer(@UserIdInt int userId, String value) { @@ -11021,11 +11020,10 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { } @Override - public boolean isNewUserDisclaimerAcknowledged() { + public boolean isNewUserDisclaimerAcknowledged(@UserIdInt int userId) { CallerIdentity callerIdentity = getCallerIdentity(); Preconditions.checkCallAuthorization(canManageUsers(callerIdentity) || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); - int userId = callerIdentity.getUserId(); synchronized (getLockObject()) { DevicePolicyData policyData = getUserData(userId); return policyData.isNewUserDisclaimerAcknowledged(); |