summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2021-02-20 00:32:50 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-02-20 00:32:50 +0000
commit85d57a85ecb0be9ab1edc05ce5c66f9c8e6a49b0 (patch)
treee62902e71ebfe92ec1f2074b09e068f9c9795351
parent064d5c7663a8674a6459211813f3db8566295f76 (diff)
parentff48ec4c6d1a1605e8afaa3e7f179b51bbc9f160 (diff)
Merge "libbinder: computed DUMP_FLAG_PRIORITY_ALL" am: 4dcf023690 am: 2539887026 am: ff48ec4c6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1595482 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icec85c7938604b4169ecbde05f0985e8187124b4
-rw-r--r--libs/binder/aidl/android/os/IServiceManager.aidl6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/binder/aidl/android/os/IServiceManager.aidl b/libs/binder/aidl/android/os/IServiceManager.aidl
index ce30050a89..2fabf947cd 100644
--- a/libs/binder/aidl/android/os/IServiceManager.aidl
+++ b/libs/binder/aidl/android/os/IServiceManager.aidl
@@ -43,9 +43,9 @@ interface IServiceManager {
*/
const int DUMP_FLAG_PRIORITY_DEFAULT = 1 << 3;
- const int DUMP_FLAG_PRIORITY_ALL = 15;
- // DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_HIGH
- // | DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PRIORITY_DEFAULT;
+ const int DUMP_FLAG_PRIORITY_ALL =
+ DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_HIGH
+ | DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PRIORITY_DEFAULT;
/* Allows services to dump sections in protobuf format. */
const int DUMP_FLAG_PROTO = 1 << 4;