| commit | ff48ec4c6d1a1605e8afaa3e7f179b51bbc9f160 | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Feb 19 23:54:10 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 23:54:10 2021 +0000 |
| tree | 2418e801d8eeb6658aa482f1d7df1694322c6f81 | |
| parent | 7361fe6c96201ed0feacfb2d9644144d7f09659c [diff] | |
| parent | 2539887026d7710f8cc8a08ac373721c8a379c9c [diff] |
Merge "libbinder: computed DUMP_FLAG_PRIORITY_ALL" am: 4dcf023690 am: 2539887026 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1595482 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idfbe97781cc4aa8dd8c5ceaa3dc4a9c61694ae7f
diff --git a/libs/binder/aidl/android/os/IServiceManager.aidl b/libs/binder/aidl/android/os/IServiceManager.aidl index ce30050..2fabf94 100644 --- a/libs/binder/aidl/android/os/IServiceManager.aidl +++ b/libs/binder/aidl/android/os/IServiceManager.aidl
@@ -43,9 +43,9 @@ */ 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;