Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25398870 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: computed DUMP_FLAG_PRIORITY_ALL" am: 4dcf0236 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1595482

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2539cca68a5923881c0663bade7bb8e37525a050
parents e6dfd1b4 4dcf0236

libs/binder/aidl/android/os/IServiceManager.aidl

+3 −3
Original line number Original line Diff line number Diff line
@@ -43,9 +43,9 @@ interface IServiceManager { 
     */

     */

    const int DUMP_FLAG_PRIORITY_DEFAULT = 1 << 3;

    const int DUMP_FLAG_PRIORITY_DEFAULT = 1 << 3;





    const int DUMP_FLAG_PRIORITY_ALL = 15;

    const int DUMP_FLAG_PRIORITY_ALL =

             // DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_HIGH

             DUMP_FLAG_PRIORITY_CRITICAL | DUMP_FLAG_PRIORITY_HIGH

             // | DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PRIORITY_DEFAULT;

             | DUMP_FLAG_PRIORITY_NORMAL | DUMP_FLAG_PRIORITY_DEFAULT;





    /* Allows services to dump sections in protobuf format. */

    /* Allows services to dump sections in protobuf format. */

    const int DUMP_FLAG_PROTO = 1 << 4;

    const int DUMP_FLAG_PROTO = 1 << 4;