commit 7969c80c7e2f2daef7a140b16443700e523fbeb7
author Roshan Pius <rpius@google.com> Mon Oct 21 19:58:57 2019 -0700
committer Roshan Pius <rpius@google.com> Wed Oct 30 20:06:30 2019 -0700
tree 7922f0ef9133a6f49f2b88807ab89562e84c1fd5
parent 87bf2b23f4b175d19e7f38c6e39ff1bb52103ce0

UserManager: Add new hasUserRestrictionForUser @SystemApi

Wifi stack needs a multi-user version of hasUserRestriction.

Bug: 142888959
Test: Compiles
Change-Id: I915de45218b95c3a2856d35d6000c429942551ec

services/core/java/com/android/server/pm/UserManagerService.java

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index fe37125..5c9b9c9 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -1593,6 +1593,7 @@
     /** @return a specific user restriction that's in effect currently. */
     @Override
     public boolean hasUserRestriction(String restrictionKey, @UserIdInt int userId) {
+        checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "hasUserRestriction");
         return mLocalService.hasUserRestriction(restrictionKey, userId);
     }
 
@@ -1717,6 +1718,7 @@
      */
     @Override
     public Bundle getUserRestrictions(@UserIdInt int userId) {
+        checkManageOrInteractPermIfCallerInOtherProfileGroup(userId, "getUserRestrictions");
         return UserRestrictionsUtils.clone(getEffectiveUserRestrictions(userId));
     }