ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixes to native app ops services 

Bug: 8181262
Change-Id: I3d3f20453f6c6f2756c988363c5b5453ef309cb6
This commit is contained in:
Eino-Ville Talvala 2013-02-19 12:54:57 -08:00
parent c4905eb49d
commit e88a85e0d0
4 changed files with 29 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/binder/AppOpsManager.h
View File

@ -28,9 +28,9 @@ class AppOpsManager
{
public:
enum {
MODE_ALLOWED = 0,
MODE_IGNORED = 1,
MODE_ERRORED = 2
MODE_ALLOWED = IAppOpsService::MODE_ALLOWED,
MODE_IGNORED = IAppOpsService::MODE_IGNORED,
MODE_ERRORED = IAppOpsService::MODE_ERRORED
};
enum {

7
include/binder/IAppOpsService.h
View File

@ -46,6 +46,12 @@ public:
START_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+4,
STOP_WATCHING_MODE_TRANSACTION = IBinder::FIRST_CALL_TRANSACTION+5
};
enum {
MODE_ALLOWED = 0,
MODE_IGNORED = 1,
MODE_ERRORED = 2
};
};
// ----------------------------------------------------------------------
@ -64,4 +70,3 @@ public:
}; // namespace android
#endif // ANDROID_IAPP_OPS_SERVICE_H

30
libs/binder/AppOpsManager.cpp
View File

@ -32,23 +32,21 @@ sp<IAppOpsService> AppOpsManager::getService()
int64_t startTime = 0;
mLock.lock();
sp<IAppOpsService> service = mService;
while (true) {
if (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;
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();

12
libs/binder/IAppOpsService.cpp
View File

@ -45,8 +45,8 @@ public:
data.writeString16(packageName);
remote()->transact(CHECK_OPERATION_TRANSACTION, data, &reply);
// fail on exception
if (reply.readExceptionCode() != 0) return 0;
return reply.readInt32() != 0;
if (reply.readExceptionCode() != 0) return MODE_ERRORED;
return reply.readInt32();
}
virtual int32_t noteOperation(int32_t code, int32_t uid, const String16& packageName) {
@ -57,8 +57,8 @@ public:
data.writeString16(packageName);
remote()->transact(NOTE_OPERATION_TRANSACTION, data, &reply);
// fail on exception
if (reply.readExceptionCode() != 0) return 0;
return reply.readInt32() != 0;
if (reply.readExceptionCode() != 0) return MODE_ERRORED;
return reply.readInt32();
}
virtual int32_t startOperation(int32_t code, int32_t uid, const String16& packageName) {
@ -69,8 +69,8 @@ public:
data.writeString16(packageName);
remote()->transact(START_OPERATION_TRANSACTION, data, &reply);
// fail on exception
if (reply.readExceptionCode() != 0) return 0;
return reply.readInt32() != 0;
if (reply.readExceptionCode() != 0) return MODE_ERRORED;
return reply.readInt32();
}
virtual void finishOperation(int32_t code, int32_t uid, const String16& packageName) {