diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-11-20 18:29:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 18:29:15 +0000 |
| commit | d9968438bcf439e7a8c6058a95b85286a632dc1c (patch) | |
| tree | 30669383d407f6560a77e601237087f7456d5a62 /core/java/android/app/IActivityManager.java | |
| parent | 2bf6529bf8f81d1b9f0ff103f12d004937d0f59f (diff) | |
| parent | ff17024e583b170312d82089fd358d278ce16c9a (diff) | |
| download | frameworks_base-d9968438bcf439e7a8c6058a95b85286a632dc1c.zip frameworks_base-d9968438bcf439e7a8c6058a95b85286a632dc1c.tar.gz frameworks_base-d9968438bcf439e7a8c6058a95b85286a632dc1c.tar.bz2 | |
Merge "Fix issue with call backs from media process." into lmp-mr1-dev
Diffstat (limited to 'core/java/android/app/IActivityManager.java')
| -rw-r--r-- | core/java/android/app/IActivityManager.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index 6433f3f..5362303 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -219,9 +219,11 @@ public interface IActivityManager extends IInterface { public int checkPermission(String permission, int pid, int uid) throws RemoteException; - - public int checkUriPermission(Uri uri, int pid, int uid, int mode, int userId) + public int checkPermissionWithToken(String permission, int pid, int uid, IBinder callerToken) throws RemoteException; + + public int checkUriPermission(Uri uri, int pid, int uid, int mode, int userId, + IBinder callerToken) throws RemoteException; public void grantUriPermission(IApplicationThread caller, String targetPkg, Uri uri, int mode, int userId) throws RemoteException; public void revokeUriPermission(IApplicationThread caller, Uri uri, int mode, int userId) @@ -785,4 +787,5 @@ public interface IActivityManager extends IInterface { int GET_TASK_DESCRIPTION_ICON_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+238; int LAUNCH_ASSIST_INTENT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+239; int START_IN_PLACE_ANIMATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+240; + int CHECK_PERMISSION_WITH_TOKEN_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+241; } |