summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Daniel Erat <derat@google.com> 2015-09-30 21:30:31 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-09-30 21:30:31 +0000
commitd3e3d8896ea0f2eba1424b57ac8a5b5d9287000c (patch)
treef21bcef786197aa09dd7ce088fc6bf559d5affdc
parent08aa3309790672ccc4c9b899fdf4e6162cfbc37a (diff)
parentc3f37589e04a52c109c63f6411db444500d4f92c (diff)
am c3f37589: Merge "Update instructions in IPowerManager.aidl."
* commit 'c3f37589e04a52c109c63f6411db444500d4f92c': Update instructions in IPowerManager.aidl.
-rw-r--r--core/java/android/os/IPowerManager.aidl7
1 files changed, 5 insertions, 2 deletions
diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl
index c4f62baab4a1..9fdbec39b2bd 100644
--- a/core/java/android/os/IPowerManager.aidl
+++ b/core/java/android/os/IPowerManager.aidl
@@ -23,8 +23,11 @@ import android.os.WorkSource;
interface IPowerManager
{
- // WARNING: The first five methods must remain the first five methods because their
- // transaction numbers must not change unless IPowerManager.cpp is also updated.
+ // WARNING: When methods are inserted or deleted, the transaction IDs in
+ // frameworks/native/include/powermanager/IPowerManager.h must be updated to match the order in this file.
+ //
+ // When a method's argument list is changed, BnPowerManager's corresponding serialization code (if any) in
+ // frameworks/native/services/powermanager/IPowerManager.cpp must be updated.
void acquireWakeLock(IBinder lock, int flags, String tag, String packageName, in WorkSource ws,
String historyTag);
void acquireWakeLockWithUid(IBinder lock, int flags, String tag, String packageName,