| commit | 2539887026d7710f8cc8a08ac373721c8a379c9c | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Fri Feb 19 23:14:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 19 23:14:33 2021 +0000 |
| tree | 25ae7fc64e8a10a75998f891589ccccc947611ee | |
| parent | e6dfd1b40c4e36c119fb686b2468c2d4781373a1 [diff] | |
| parent | 4dcf023690249f751f2da8fe977f2c4404aeab9a [diff] |
Merge "libbinder: computed DUMP_FLAG_PRIORITY_ALL" am: 4dcf023690 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1595482 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2539cca68a5923881c0663bade7bb8e37525a050
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;