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

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

Merge "reflect libbinder/am split" am: da164b6f 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1664801

Change-Id: I395ed01c474d9d4604b03877158932cf24d73180
parents 0c71f7c0 da164b6f

core/java/android/app/IUidObserver.aidl

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ oneway interface IUidObserver { 
    // below block of transactions.



    // Since these transactions are also called from native code, these must be kept in sync with

    // the ones in frameworks/native/include/binder/IActivityManager.h

    // the ones in frameworks/native/include_activitymanager/binder/IActivityManager.h

    // =============== Beginning of transactions used on native side as well ======================



    /**

native/android/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ cc_library_shared { 
        "libgui",

        "libharfbuzz_ng",  // Only for including hb.h via minikin

        "libsensor",

        "libactivitymanager_aidl",

        "libandroid_runtime",

        "libminikin",

        "libnetd_client",