commit 644648ebfd93d11405b23cb667ac625653221b69
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 03 16:43:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 03 16:43:08 2017 +0000
tree 7c27d02a2611397672cd13c29cf0232efca9d1cd
parent 5c8832a983d14295028f3ee496f116697584d598
parent 63ee64cca76a6f12d29695b31d0a9a594cc0ea86

Merge "Expose instant app to exposed providers" into oc-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 c27fa1b..8117f6d 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -11516,6 +11516,9 @@
                 }
             }
             checkTime(startTime, "getContentProviderImpl: done!");
+
+            grantEphemeralAccessLocked(userId, null /*intent*/,
+                    cpi.applicationInfo.uid, UserHandle.getAppId(Binder.getCallingUid()));
         }
 
         // Wait for the provider to be published...