diff options
Diffstat (limited to 'libs/binder')
-rw-r--r-- | libs/binder/Android.mk | 3 | ||||
-rw-r--r-- | libs/binder/AppOpsManager.cpp | 94 | ||||
-rw-r--r-- | libs/binder/IAppOpsCallback.cpp | 70 | ||||
-rw-r--r-- | libs/binder/IAppOpsService.cpp | 172 | ||||
-rw-r--r-- | libs/binder/IMemory.cpp | 4 | ||||
-rw-r--r-- | libs/binder/ProcessState.cpp | 19 |
6 files changed, 354 insertions, 8 deletions
diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk index d449298..994d3db 100644 --- a/libs/binder/Android.mk +++ b/libs/binder/Android.mk @@ -14,8 +14,11 @@ # we have the common sources, plus some device-specific stuff sources := \ + AppOpsManager.cpp \ Binder.cpp \ BpBinder.cpp \ + IAppOpsCallback.cpp \ + IAppOpsService.cpp \ IInterface.cpp \ IMemory.cpp \ IPCThreadState.cpp \ diff --git a/libs/binder/AppOpsManager.cpp b/libs/binder/AppOpsManager.cpp new file mode 100644 index 0000000..7ac1b11 --- /dev/null +++ b/libs/binder/AppOpsManager.cpp @@ -0,0 +1,94 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include <binder/AppOpsManager.h> +#include <binder/IServiceManager.h> + +#include <utils/SystemClock.h> + +namespace android { + +static String16 _appops("appops"); + +AppOpsManager::AppOpsManager() +{ +} + +sp<IAppOpsService> AppOpsManager::getService() +{ + int64_t startTime = 0; + mLock.lock(); + sp<IAppOpsService> service = mService; + while (service == NULL || !service->asBinder()->isBinderAlive()) { + sp<IBinder> binder = defaultServiceManager()->checkService(_appops); + if (binder == NULL) { + // Wait for the app ops service to come back... + if (startTime == 0) { + startTime = uptimeMillis(); + ALOGI("Waiting for app ops service"); + } else if ((uptimeMillis()-startTime) > 10000) { + ALOGW("Waiting too long for app ops service, giving up"); + return NULL; + } + sleep(1); + } else { + service = interface_cast<IAppOpsService>(binder); + mService = service; + } + } + mLock.unlock(); + return service; +} + +int32_t AppOpsManager::checkOp(int32_t op, int32_t uid, const String16& callingPackage) +{ + sp<IAppOpsService> service = getService(); + return service != NULL ? service->checkOperation(op, uid, callingPackage) : MODE_IGNORED; +} + +int32_t AppOpsManager::noteOp(int32_t op, int32_t uid, const String16& callingPackage) { + sp<IAppOpsService> service = getService(); + return service != NULL ? service->noteOperation(op, uid, callingPackage) : MODE_IGNORED; +} + +int32_t AppOpsManager::startOp(int32_t op, int32_t uid, const String16& callingPackage) { + sp<IAppOpsService> service = getService(); + return service != NULL ? service->startOperation(op, uid, callingPackage) : MODE_IGNORED; +} + +void AppOpsManager::finishOp(int32_t op, int32_t uid, const String16& callingPackage) { + sp<IAppOpsService> service = getService(); + if (service != NULL) { + service->finishOperation(op, uid, callingPackage); + } +} + +void AppOpsManager::startWatchingMode(int32_t op, const String16& packageName, + const sp<IAppOpsCallback>& callback) { + sp<IAppOpsService> service = getService(); + if (service != NULL) { + service->startWatchingMode(op, packageName, callback); + } +} + +void AppOpsManager::stopWatchingMode(const sp<IAppOpsCallback>& callback) { + sp<IAppOpsService> service = getService(); + if (service != NULL) { + service->stopWatchingMode(callback); + } +} + +}; // namespace android diff --git a/libs/binder/IAppOpsCallback.cpp b/libs/binder/IAppOpsCallback.cpp new file mode 100644 index 0000000..e0aad23 --- /dev/null +++ b/libs/binder/IAppOpsCallback.cpp @@ -0,0 +1,70 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "AppOpsCallback" + +#include <binder/IAppOpsCallback.h> + +#include <utils/Debug.h> +#include <utils/Log.h> +#include <binder/Parcel.h> +#include <utils/String8.h> + +#include <private/binder/Static.h> + +namespace android { + +// ---------------------------------------------------------------------- + +class BpAppOpsCallback : public BpInterface<IAppOpsCallback> +{ +public: + BpAppOpsCallback(const sp<IBinder>& impl) + : BpInterface<IAppOpsCallback>(impl) + { + } + + virtual void opChanged(int32_t op, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsCallback::getInterfaceDescriptor()); + data.writeInt32(op); + data.writeString16(packageName); + remote()->transact(OP_CHANGED_TRANSACTION, data, &reply); + } +}; + +IMPLEMENT_META_INTERFACE(AppOpsCallback, "com.android.internal.app.IAppOpsCallback"); + +// ---------------------------------------------------------------------- + +status_t BnAppOpsCallback::onTransact( + uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) +{ + switch(code) { + case OP_CHANGED_TRANSACTION: { + CHECK_INTERFACE(IAppOpsCallback, data, reply); + int32_t op = data.readInt32(); + String16 packageName = data.readString16(); + opChanged(op, packageName); + reply->writeNoException(); + return NO_ERROR; + } break; + default: + return BBinder::onTransact(code, data, reply, flags); + } +} + +}; // namespace android diff --git a/libs/binder/IAppOpsService.cpp b/libs/binder/IAppOpsService.cpp new file mode 100644 index 0000000..282b30f --- /dev/null +++ b/libs/binder/IAppOpsService.cpp @@ -0,0 +1,172 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#define LOG_TAG "AppOpsService" + +#include <binder/IAppOpsService.h> + +#include <utils/Debug.h> +#include <utils/Log.h> +#include <binder/Parcel.h> +#include <utils/String8.h> + +#include <private/binder/Static.h> + +namespace android { + +// ---------------------------------------------------------------------- + +class BpAppOpsService : public BpInterface<IAppOpsService> +{ +public: + BpAppOpsService(const sp<IBinder>& impl) + : BpInterface<IAppOpsService>(impl) + { + } + + virtual int32_t checkOperation(int32_t code, int32_t uid, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(code); + data.writeInt32(uid); + data.writeString16(packageName); + remote()->transact(CHECK_OPERATION_TRANSACTION, data, &reply); + // fail on exception + if (reply.readExceptionCode() != 0) return MODE_ERRORED; + return reply.readInt32(); + } + + virtual int32_t noteOperation(int32_t code, int32_t uid, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(code); + data.writeInt32(uid); + data.writeString16(packageName); + remote()->transact(NOTE_OPERATION_TRANSACTION, data, &reply); + // fail on exception + if (reply.readExceptionCode() != 0) return MODE_ERRORED; + return reply.readInt32(); + } + + virtual int32_t startOperation(int32_t code, int32_t uid, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(code); + data.writeInt32(uid); + data.writeString16(packageName); + remote()->transact(START_OPERATION_TRANSACTION, data, &reply); + // fail on exception + if (reply.readExceptionCode() != 0) return MODE_ERRORED; + return reply.readInt32(); + } + + virtual void finishOperation(int32_t code, int32_t uid, const String16& packageName) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(code); + data.writeInt32(uid); + data.writeString16(packageName); + remote()->transact(FINISH_OPERATION_TRANSACTION, data, &reply); + } + + virtual void startWatchingMode(int32_t op, const String16& packageName, + const sp<IAppOpsCallback>& callback) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeInt32(op); + data.writeString16(packageName); + data.writeStrongBinder(callback->asBinder()); + remote()->transact(START_WATCHING_MODE_TRANSACTION, data, &reply); + } + + virtual void stopWatchingMode(const sp<IAppOpsCallback>& callback) { + Parcel data, reply; + data.writeInterfaceToken(IAppOpsService::getInterfaceDescriptor()); + data.writeStrongBinder(callback->asBinder()); + remote()->transact(STOP_WATCHING_MODE_TRANSACTION, data, &reply); + } +}; + +IMPLEMENT_META_INTERFACE(AppOpsService, "com.android.internal.app.IAppOpsService"); + +// ---------------------------------------------------------------------- + +status_t BnAppOpsService::onTransact( + uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags) +{ + //printf("AppOpsService received: "); data.print(); + switch(code) { + case CHECK_OPERATION_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + int32_t code = data.readInt32(); + int32_t uid = data.readInt32(); + String16 packageName = data.readString16(); + int32_t res = checkOperation(code, uid, packageName); + reply->writeNoException(); + reply->writeInt32(res); + return NO_ERROR; + } break; + case NOTE_OPERATION_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + int32_t code = data.readInt32(); + int32_t uid = data.readInt32(); + String16 packageName = data.readString16(); + int32_t res = noteOperation(code, uid, packageName); + reply->writeNoException(); + reply->writeInt32(res); + return NO_ERROR; + } break; + case START_OPERATION_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + int32_t code = data.readInt32(); + int32_t uid = data.readInt32(); + String16 packageName = data.readString16(); + int32_t res = startOperation(code, uid, packageName); + reply->writeNoException(); + reply->writeInt32(res); + return NO_ERROR; + } break; + case FINISH_OPERATION_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + int32_t code = data.readInt32(); + int32_t uid = data.readInt32(); + String16 packageName = data.readString16(); + finishOperation(code, uid, packageName); + reply->writeNoException(); + return NO_ERROR; + } break; + case START_WATCHING_MODE_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + int32_t op = data.readInt32(); + String16 packageName = data.readString16(); + sp<IAppOpsCallback> callback = interface_cast<IAppOpsCallback>(data.readStrongBinder()); + startWatchingMode(op, packageName, callback); + reply->writeNoException(); + return NO_ERROR; + } break; + case STOP_WATCHING_MODE_TRANSACTION: { + CHECK_INTERFACE(IAppOpsService, data, reply); + sp<IAppOpsCallback> callback = interface_cast<IAppOpsCallback>(data.readStrongBinder()); + stopWatchingMode(callback); + reply->writeNoException(); + return NO_ERROR; + } break; + default: + return BBinder::onTransact(code, data, reply, flags); + } +} + +}; // namespace android diff --git a/libs/binder/IMemory.cpp b/libs/binder/IMemory.cpp index cd2451a..07cb41a 100644 --- a/libs/binder/IMemory.cpp +++ b/libs/binder/IMemory.cpp @@ -246,9 +246,7 @@ BpMemoryHeap::~BpMemoryHeap() { if (VERBOSE) { ALOGD("UNMAPPING binder=%p, heap=%p, size=%d, fd=%d", binder.get(), this, mSize, mHeapId); - CallStack stack; - stack.update(); - stack.dump("callstack"); + CallStack stack(LOG_TAG); } munmap(mBase, mSize); diff --git a/libs/binder/ProcessState.cpp b/libs/binder/ProcessState.cpp index d95fd6f..294e1d4 100644 --- a/libs/binder/ProcessState.cpp +++ b/libs/binder/ProcessState.cpp @@ -283,15 +283,20 @@ void ProcessState::setArgV0(const char* txt) } } +String8 ProcessState::makeBinderThreadName() { + int32_t s = android_atomic_add(1, &mThreadPoolSeq); + String8 name; + name.appendFormat("Binder_%X", s); + return name; +} + void ProcessState::spawnPooledThread(bool isMain) { if (mThreadPoolStarted) { - int32_t s = android_atomic_add(1, &mThreadPoolSeq); - char buf[16]; - snprintf(buf, sizeof(buf), "Binder_%X", s); - ALOGV("Spawning new pooled thread, name=%s\n", buf); + String8 name = makeBinderThreadName(); + ALOGV("Spawning new pooled thread, name=%s\n", name.string()); sp<Thread> t = new PoolThread(isMain); - t->run(buf); + t->run(name.string()); } } @@ -304,6 +309,10 @@ status_t ProcessState::setThreadPoolMaxThreadCount(size_t maxThreads) { return result; } +void ProcessState::giveThreadPoolName() { + androidSetThreadName( makeBinderThreadName().string() ); +} + static int open_driver() { int fd = open("/dev/binder", O_RDWR); |