Merge "Grant ephemeral app access during service bind" into oc-dev

am: b3af9b7eb7 Change-Id: Id5f5c10b732218d424be259fc1578adbbf9794b7
2017-05-04 00:06:55 +00:00
parent 7c146c0a76 b3af9b7eb7
commit cd1944336d
1 changed files with 4 additions and 0 deletions
--- a/services/core/java/com/android/server/am/ActiveServices.java
+++ b/services/core/java/com/android/server/am/ActiveServices.java
@@ -1258,6 +1258,10 @@ public final class ActiveServices {

            mAm.startAssociationLocked(callerApp.uid, callerApp.processName, callerApp.curProcState,
                    s.appInfo.uid, s.name, s.processName);
+            // Once the apps have become associated, if one of them is caller is ephemeral
+            // the target app should now be able to see the calling app
+            mAm.grantEphemeralAccessLocked(callerApp.userId, service,
+                    s.appInfo.uid, UserHandle.getAppId(callerApp.uid));

            AppBindRecord b = s.retrieveAppBindingLocked(service, callerApp);
            ConnectionRecord c = new ConnectionRecord(b, activity,