commit 3bbceddb94d627495c0022d6e3f92a5cb16aebea
author Zoltan Szatmary-Ban <szatmz@google.com> Thu Nov 26 13:45:51 2015 +0000
committer Zoltan Szatmary-Ban <szatmz@google.com> Mon Dec 07 10:43:24 2015 +0000
tree 1728e932861e2a7bdcbaa710cb37547f9fec449f
parent 010278d98099fbcd42f6025a94d3ab569e54e8b4

Make base user restrictions queriable for system apps

Needed by e.g. Settings > Location

Bug:22541939
Change-Id: I6cdd5f1c32cde143232eb53f531bbf3a737d8a9a

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 da10a94..a65a189 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -784,6 +784,15 @@
     }
 
     @Override
+    public boolean hasBaseUserRestriction(String restrictionKey, int userId) {
+        checkManageUsersPermission("hasBaseUserRestriction");
+        synchronized (mRestrictionsLock) {
+            Bundle bundle = mBaseUserRestrictions.get(userId);
+            return (bundle != null && bundle.getBoolean(restrictionKey, false));
+        }
+    }
+
+    @Override
     public void setUserRestriction(String key, boolean value, int userId) {
         checkManageUsersPermission("setUserRestriction");
         synchronized (mRestrictionsLock) {