diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2018-05-04 19:35:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-04 19:35:44 +0000 |
| commit | 7bfb942e2d240dc1c52bfd0926517a7dbd3942fb (patch) | |
| tree | 75fb6170e1c1b377b5da14b856e610d19f5ce610 /core/java | |
| parent | ffee7c721169adddcfde879944900ca426532749 (diff) | |
| parent | de32b83499151ad8e0b47bd90cb0a87cdfb7cf01 (diff) | |
Merge "Propagate calling UID to AM from CrossProfileApps" into pi-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/pm/CrossProfileApps.java | 6 | ||||
| -rw-r--r-- | core/java/android/content/pm/ICrossProfileApps.aidl | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/core/java/android/content/pm/CrossProfileApps.java b/core/java/android/content/pm/CrossProfileApps.java index 7d5d6090788c..87f4dab1115a 100644 --- a/core/java/android/content/pm/CrossProfileApps.java +++ b/core/java/android/content/pm/CrossProfileApps.java @@ -64,7 +64,11 @@ public class CrossProfileApps { public void startMainActivity(@NonNull ComponentName component, @NonNull UserHandle targetUser) { try { - mService.startActivityAsUser(mContext.getPackageName(), component, targetUser); + mService.startActivityAsUser( + mContext.getIApplicationThread(), + mContext.getPackageName(), + component, + targetUser); } catch (RemoteException ex) { throw ex.rethrowFromSystemServer(); } diff --git a/core/java/android/content/pm/ICrossProfileApps.aidl b/core/java/android/content/pm/ICrossProfileApps.aidl index e79deb96838b..bc2f92a9bf51 100644 --- a/core/java/android/content/pm/ICrossProfileApps.aidl +++ b/core/java/android/content/pm/ICrossProfileApps.aidl @@ -16,6 +16,7 @@ package android.content.pm; +import android.app.IApplicationThread; import android.content.ComponentName; import android.content.Intent; import android.graphics.Rect; @@ -26,7 +27,7 @@ import android.os.UserHandle; * @hide */ interface ICrossProfileApps { - void startActivityAsUser(in String callingPackage, in ComponentName component, - in UserHandle user); + void startActivityAsUser(in IApplicationThread caller, in String callingPackage, + in ComponentName component, in UserHandle user); List<UserHandle> getTargetUserProfiles(in String callingPackage); }
\ No newline at end of file |