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

Commit 0bfd7133 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "IServiceManager: check constant values consistancy" 

am: ed8f1294

Change-Id: Iad0ff999b93d51b0f751a18635dfd967cc94a1b5
parents 554e0296 ed8f1294

libs/binder/IServiceManager.cpp

+11 −0
Original line number Diff line number Diff line
@@ -43,6 +43,17 @@ namespace android { 
using AidlServiceManager = android::os::IServiceManager;

using android::binder::Status;



// libbinder's IServiceManager.h can't rely on the values generated by AIDL

// because many places use its headers via include_dirs (meaning, without

// declaring the dependency in the build system). So, for now, we can just check

// the values here.

static_assert(AidlServiceManager::DUMP_FLAG_PRIORITY_CRITICAL == IServiceManager::DUMP_FLAG_PRIORITY_CRITICAL);

static_assert(AidlServiceManager::DUMP_FLAG_PRIORITY_HIGH == IServiceManager::DUMP_FLAG_PRIORITY_HIGH);

static_assert(AidlServiceManager::DUMP_FLAG_PRIORITY_NORMAL == IServiceManager::DUMP_FLAG_PRIORITY_NORMAL);

static_assert(AidlServiceManager::DUMP_FLAG_PRIORITY_DEFAULT == IServiceManager::DUMP_FLAG_PRIORITY_DEFAULT);

static_assert(AidlServiceManager::DUMP_FLAG_PRIORITY_ALL == IServiceManager::DUMP_FLAG_PRIORITY_ALL);

static_assert(AidlServiceManager::DUMP_FLAG_PROTO == IServiceManager::DUMP_FLAG_PROTO);



sp<IServiceManager> defaultServiceManager()

{

    static Mutex gDefaultServiceManagerLock;

libs/binder/include/binder/IServiceManager.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class IServiceManager : public IInterface 
public:

    DECLARE_META_INTERFACE(ServiceManager)

    /**

     * Must match values in IServiceManager.java

     * Must match values in IServiceManager.aidl

     */

    /* Allows services to dump sections according to priorities. */

    static const int DUMP_FLAG_PRIORITY_CRITICAL = 1 << 0;