diff options
| author | Steven Moreland <smoreland@google.com> | 2019-11-18 16:42:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-11-18 16:42:27 +0000 |
| commit | 47322c31dbc4c6335816d3d3bdb7df6d179bd698 (patch) | |
| tree | 66fb986323e1d62315fd8014a12fe09539cefc96 | |
| parent | 6cea68f9a126090f4c291b1c59a7858a02fc0c56 (diff) | |
| parent | 1d4b5b4af925582fe66b4cdd913ebad942a5a38a (diff) | |
| download | native-47322c31dbc4c6335816d3d3bdb7df6d179bd698.tar.gz | |
Merge "IServiceManager: @nullable IBinder"
| -rw-r--r-- | libs/binder/aidl/android/os/IServiceManager.aidl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/aidl/android/os/IServiceManager.aidl b/libs/binder/aidl/android/os/IServiceManager.aidl index 8c7ebbaf36..b965881e7f 100644 --- a/libs/binder/aidl/android/os/IServiceManager.aidl +++ b/libs/binder/aidl/android/os/IServiceManager.aidl @@ -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 |