diff options
| -rw-r--r-- | libs/binder/AppOpsManager.cpp | 8 | ||||
| -rw-r--r-- | libs/binder/IAppOpsService.cpp | 27 | ||||
| -rw-r--r-- | libs/binder/include/binder/AppOpsManager.h | 2 | ||||
| -rw-r--r-- | libs/binder/include/binder/IAppOpsService.h | 3 |
4 files changed, 40 insertions, 0 deletions
diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp index a494e22392..525685c35e 100644 --- a/libs/binder/AppOpsManager.cpp +++ b/libs/binder/AppOpsManager.cpp @@ -93,6 +93,14 @@ int32_t AppOpsManager::checkOp(int32_t op, int32_t uid, const String16& callingP : APP_OPS_MANAGER_UNAVAILABLE_MODE; } +int32_t AppOpsManager::checkAudioOpNoThrow(int32_t op, int32_t usage, int32_t uid, + const String16& callingPackage) { + sp<IAppOpsService> service = getService(); + return service != nullptr + ? service->checkAudioOperation(op, usage, uid, callingPackage) + : APP_OPS_MANAGER_UNAVAILABLE_MODE; +} + int32_t AppOpsManager::noteOp(int32_t op, int32_t uid, const String16& callingPackage) { sp<IAppOpsService> service = getService(); return service != nullptr diff --git a/libs/binder/IAppOpsService.cpp b/libs/binder/IAppOpsService.cpp index fb0d521cac..66d6e31902 100644 --- a/libs/binder/IAppOpsService.cpp +++ b/libs/binder/IAppOpsService.cpp @@ -123,6 +123,22 @@ public: if (reply.readExceptionCode() != 0) return -1; return reply.readInt32(); } + + virtual int32_t checkAudioOperation(int32_t code, int32_t usage, + int32_t uid, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(code); + data.writeInt32(usage); + data.writeInt32(uid); + data.writeString16(packageName); + remote()->transact(CHECK_AUDIO_OPERATION_TRANSACTION, data, &reply); + // fail on exception + if (reply.readExceptionCode() != 0) { + return MODE_ERRORED; + } + return reply.readInt32(); + } }; IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService"); @@ -209,6 +225,17 @@ status_t BnAppOpsService::onTransact( reply->writeInt32(opCode); return NO_ERROR; } break; + case CHECK_AUDIO_OPERATION_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + const int32_t code = data.readInt32(); + const int32_t usage = data.readInt32(); + const int32_t uid = data.readInt32(); + const String16 packageName = data.readString16(); + const int32_t res = checkAudioOperation(code, usage, uid, packageName); + reply->writeNoException(); + reply->writeInt32(res); + return NO_ERROR; + } break; default: return BBinder::onTransact(code, data, reply, flags); } diff --git a/libs/binder/include/binder/AppOpsManager.h b/libs/binder/include/binder/AppOpsManager.h index 37237dfd48..17493b4252 100644 --- a/libs/binder/include/binder/AppOpsManager.h +++ b/libs/binder/include/binder/AppOpsManager.h @@ -114,6 +114,8 @@ public: AppOpsManager(); int32_t checkOp(int32_t op, int32_t uid, const String16& callingPackage); + int32_t checkAudioOpNoThrow(int32_t op, int32_t usage, int32_t uid, + const String16& callingPackage); int32_t noteOp(int32_t op, int32_t uid, const String16& callingPackage); int32_t startOpNoThrow(int32_t op, int32_t uid, const String16& callingPackage, bool startIfModeDefault); diff --git a/libs/binder/include/binder/IAppOpsService.h b/libs/binder/include/binder/IAppOpsService.h index 78078513ff..3dbd0d9f7a 100644 --- a/libs/binder/include/binder/IAppOpsService.h +++ b/libs/binder/include/binder/IAppOpsService.h @@ -43,6 +43,8 @@ public: virtual void stopWatchingMode(const sp<IAppOpsCallback>& callback) = 0; virtual sp<IBinder> getToken(const sp<IBinder>& clientToken) = 0; virtual int32_t permissionToOpCode(const String16& permission) = 0; + virtual int32_t checkAudioOperation(int32_t code, int32_t usage,int32_t uid, + const String16& packageName) = 0; enum { CHECK_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION, @@ -53,6 +55,7 @@ public: STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5, GET_TOKEN_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+6, PERMISSION_TO_OP_CODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+7, + CHECK_AUDIO_OPERATION_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+8, }; enum { |