commit 759a763f5f03fda86b96d238faedb870fbee24ec
author Makoto Onuki <omakoto@google.com> Wed Oct 28 16:43:10 2015 -0700
committer Makoto Onuki <omakoto@google.com> Mon Nov 02 13:33:58 2015 -0800
tree 4b9307cdfef7b61cc75003722e0ce480a2b74915
parent ec721632d19fe96abf15ed5dcf25de7ac19fdfae

Allow DO to disable camera device-wise.

Bug 24538855

Change-Id: I421690f14ee57fa818d2b233fe48a90a0a575a9e

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 4dd7388..e188343 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -742,10 +742,11 @@
             mBaseUserRestrictions.put(userId, newRestrictions);
         }
 
-        mCachedEffectiveUserRestrictions.put(
-                userId, computeEffectiveUserRestrictionsRL(userId));
+        final Bundle effective = computeEffectiveUserRestrictionsRL(userId);
 
-        applyUserRestrictionsRL(userId, mBaseUserRestrictions.get(userId), prevRestrictions);
+        mCachedEffectiveUserRestrictions.put(userId, effective);
+
+        applyUserRestrictionsRL(userId, effective, prevRestrictions);
     }
 
     @GuardedBy("mRestrictionsLock")