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

Merge "Native counterpart of new power manager method"

Browse Source
This commit is contained in:
Marco Nelissen 2013-10-18 14:28:55 +00:00 committed by Android (Google) Code Review
commit 8938550af4
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/binder/Parcel.h
View File

@ -101,6 +101,7 @@ public:
status_t writeString16(const char16_t* str, size_t len); status_t writeString16(const char16_t* str, size_t len);
status_t writeStrongBinder(const sp<IBinder>& val); status_t writeStrongBinder(const sp<IBinder>& val);
status_t writeWeakBinder(const wp<IBinder>& val); status_t writeWeakBinder(const wp<IBinder>& val);
status_t writeInt32Array(size_t len, const int32_t *val);
template<typename T> template<typename T>
status_t write(const Flattenable<T>& val); status_t write(const Flattenable<T>& val);

1
include/powermanager/IPowerManager.h
View File

@ -35,6 +35,7 @@ public:
virtual status_t acquireWakeLockWithUid(int flags, const sp<IBinder>& lock, const String16& tag, virtual status_t acquireWakeLockWithUid(int flags, const sp<IBinder>& lock, const String16& tag,
const String16& packageName, int uid) = 0; const String16& packageName, int uid) = 0;
virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0; virtual status_t releaseWakeLock(const sp<IBinder>& lock, int flags) = 0;
virtual status_t updateWakeLockUids(const sp<IBinder>& lock, int len, const int *uids) = 0;
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

10
libs/binder/Parcel.cpp
View File

@ -617,6 +617,16 @@ status_t Parcel::writeInt32(int32_t val)
{ {
return writeAligned(val); return writeAligned(val);
} }
status_t Parcel::writeInt32Array(size_t len, const int32_t *val) {
if (!val) {
return writeAligned(-1);
}
status_t ret = writeAligned(len);
if (ret == NO_ERROR) {
ret = write(val, len * sizeof(*val));
}
return ret;
}
status_t Parcel::writeInt64(int64_t val) status_t Parcel::writeInt64(int64_t val)
{ {

11
services/powermanager/IPowerManager.cpp
View File

@ -32,6 +32,7 @@ enum {
ACQUIRE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION, ACQUIRE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION,
ACQUIRE_WAKE_LOCK_UID = IBinder::FIRST_CALL_TRANSACTION + 1, ACQUIRE_WAKE_LOCK_UID = IBinder::FIRST_CALL_TRANSACTION + 1,
RELEASE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION + 2, RELEASE_WAKE_LOCK = IBinder::FIRST_CALL_TRANSACTION + 2,
UPDATE_WAKE_LOCK_UIDS = IBinder::FIRST_CALL_TRANSACTION + 3,
}; };
class BpPowerManager : public BpInterface<IPowerManager> class BpPowerManager : public BpInterface<IPowerManager>
@ -78,6 +79,16 @@ public:
data.writeInt32(flags); data.writeInt32(flags);
return remote()->transact(RELEASE_WAKE_LOCK, data, &reply); return remote()->transact(RELEASE_WAKE_LOCK, data, &reply);
} }
virtual status_t updateWakeLockUids(const sp<IBinder>& lock, int len, const int *uids) {
Parcel data, reply;
data.writeInterfaceToken(IPowerManager::getInterfaceDescriptor());
data.writeStrongBinder(lock);
data.writeInt32Array(len, uids);
// We don't really care too much if this succeeds (there's nothing we can do if it doesn't)
// but it should return ASAP
return remote()->transact(UPDATE_WAKE_LOCK_UIDS, data, &reply, IBinder::FLAG_ONEWAY);
}
}; };
IMPLEMENT_META_INTERFACE(PowerManager, "android.os.IPowerManager"); IMPLEMENT_META_INTERFACE(PowerManager, "android.os.IPowerManager");