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

Commit 287399b5 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

Merge "IServiceManager: @nullable IBinder" 

am: 47322c31

Change-Id: I5d187e806c08968b00ef98080a2611fbdf98c8ac
parents 4ac2d1e9 47322c31

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

+2 −2
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ interface IServiceManager { 
     * Returns null if the service does not exist.

     */

    @UnsupportedAppUsage

    IBinder getService(@utf8InCpp String name);

    @nullable IBinder getService(@utf8InCpp String name);



    /**

     * Retrieve an existing service called @a name from the service
@@ -66,7 +66,7 @@ interface IServiceManager { 
     * exist.

     */

    @UnsupportedAppUsage

    IBinder checkService(@utf8InCpp String name);

    @nullable IBinder checkService(@utf8InCpp String name);



    /**

     * Place a new @a service called @a name into the service