summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2013-07-18 18:13:14 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-07-18 18:13:14 +0000
commit1962f6513732682645f74561c0665e168196056e (patch)
tree7f51658549d5b429f6add0e911a853b46ed09aa4 /include
parent3ec92e1ad7258a61eb5bfb7f77fe883d23a85884 (diff)
parent913b63d235a982174b66acad95ca2f87ac8a1982 (diff)
downloadframeworks_native-1962f6513732682645f74561c0665e168196056e.zip
frameworks_native-1962f6513732682645f74561c0665e168196056e.tar.gz
frameworks_native-1962f6513732682645f74561c0665e168196056e.tar.bz2
Merge "Follow framework change to track started ops by proc."
Diffstat (limited to 'include')
-rw-r--r--include/binder/IAppOpsService.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/include/binder/IAppOpsService.h b/include/binder/IAppOpsService.h
index 7cb55e5..193e9cc 100644
--- a/include/binder/IAppOpsService.h
+++ b/include/binder/IAppOpsService.h
@@ -32,11 +32,14 @@ public:
virtual int32_t checkOperation(int32_t code, int32_t uid, const String16& packageName) = 0;
virtual int32_t noteOperation(int32_t code, int32_t uid, const String16& packageName) = 0;
- virtual int32_t startOperation(int32_t code, int32_t uid, const String16& packageName) = 0;
- virtual void finishOperation(int32_t code, int32_t uid, const String16& packageName) = 0;
+ virtual int32_t startOperation(const sp<IBinder>& token, int32_t code, int32_t uid,
+ const String16& packageName) = 0;
+ virtual void finishOperation(const sp<IBinder>& token, int32_t code, int32_t uid,
+ const String16& packageName) = 0;
virtual void startWatchingMode(int32_t op, const String16& packageName,
const sp<IAppOpsCallback>& callback) = 0;
virtual void stopWatchingMode(const sp<IAppOpsCallback>& callback) = 0;
+ virtual sp<IBinder> getToken(const sp<IBinder>& clientToken) = 0;
enum {
CHECK_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION,
@@ -44,7 +47,8 @@ public:
START_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+2,
FINISH_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+3,
START_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+4,
- STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5
+ STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5,
+ GET_TOKEN_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+6,
};
enum {