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

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

Merge "reflect libbinder/am split" into sc-dev am: 544010a9 

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

Change-Id: Ia64a2e7b45fc66f39b8b49b4a62c15cc8435d51b
parents 5efefe36 544010a9

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
@@ -79,6 +79,7 @@ cc_library_shared { 
        "libgui",

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

        "libsensor",

        "libactivitymanager_aidl",

        "libandroid_runtime",

        "libminikin",

        "libnetd_client",