commit 5b3d1a8690841749fc9b3e1d5288a225921a15b7
author Steven Moreland <smoreland@google.com> Mon Nov 18 09:02:18 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Nov 18 09:02:18 2019 -0800
tree c67e46085ee008cc4029394001012a511039967b
parent 724e40e5ced5d95643bbd34da699d4812504dacd
parent 287399b569985d046da5e3a9b9db684f90116488

Merge "IServiceManager: @nullable IBinder" am: 47322c31db
am: 287399b569

Change-Id: I34af74a89f8525d0aee02d6dbf3bf06dfe8b7732

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

diff --git a/libs/binder/aidl/android/os/IServiceManager.aidl b/libs/binder/aidl/android/os/IServiceManager.aidl
index 8c7ebba..b965881 100644
--- a/libs/binder/aidl/android/os/IServiceManager.aidl
+++ b/libs/binder/aidl/android/os/IServiceManager.aidl
@@ -58,7 +58,7 @@
      * 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 @@
      * exist.
      */
     @UnsupportedAppUsage
-    IBinder checkService(@utf8InCpp String name);
+    @nullable IBinder checkService(@utf8InCpp String name);
 
     /**
      * Place a new @a service called @a name into the service