commit 9034620dd5a13e4b76cf6c31fb1fd7e5b79678e3
author Amith Yamasani <yamasani@google.com> Thu Jul 17 01:44:08 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 16 23:42:05 2014 +0000
tree e418674045a1ebd349f44ec5b3bf0181aaab9a99
parent 20ceb903731bc732eb063b1bbee3bac806a5d5ef
parent ebf1fd99d67875c36c7dcd09b2246b6c3e22e9ae

Merge "Allow content provider access across users" into lmp-dev

services/core/java/com/android/server/am/ActivityManagerService.java

diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 1316da1..0f55b0f 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -8054,7 +8054,7 @@
                 checkedGrants = true;
             }
             userId = handleIncomingUser(callingPid, callingUid, userId,
-                    false, ALLOW_NON_FULL_IN_PROFILE,
+                    false, ALLOW_NON_FULL,
                     "checkContentProviderPermissionLocked " + cpi.authority, null);
             if (userId != tmpTargetUserId) {
                 // When we actually went to determine the final targer user ID, this ended