commit ce80de5db072878cc8e330dc716d411355b48d08
author Yifan Hong <elsk@google.com> Wed Nov 17 05:02:35 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 17 05:02:35 2021 +0000
tree 8447ed2841372315cf6740211f74f59e1ec9e20e
parent 7d0bdd39fdad70b47e4ef1127122c27b4430cbe2
parent 6a2929d6ceaf6d0efd7a4f05d583e9185150b441

Merge "Add ServiceManager.registerForNotifications"

core/java/android/os/ServiceManager.java

diff --git a/core/java/android/os/ServiceManager.java b/core/java/android/os/ServiceManager.java
index 4e8418b..ba5ed43 100644
--- a/core/java/android/os/ServiceManager.java
+++ b/core/java/android/os/ServiceManager.java
@@ -298,6 +298,17 @@
     }
 
     /**
+     * Register callback for service registration notifications.
+     *
+     * @throws RemoteException for underlying error.
+     * @hide
+     */
+    public static void registerForNotifications(
+            @NonNull String name, @NonNull IServiceCallback callback) throws RemoteException {
+        getIServiceManager().registerForNotifications(name, callback);
+    }
+
+    /**
      * Return a list of all currently running services.
      * @return an array of all currently running services, or <code>null</code> in
      * case of an exception

core/java/android/os/ServiceManagerNative.java

diff --git a/core/java/android/os/ServiceManagerNative.java b/core/java/android/os/ServiceManagerNative.java
index 3739040..2dcf674 100644
--- a/core/java/android/os/ServiceManagerNative.java
+++ b/core/java/android/os/ServiceManagerNative.java
@@ -78,7 +78,7 @@
 
     public void registerForNotifications(String name, IServiceCallback cb)
             throws RemoteException {
-        throw new RemoteException();
+        mServiceManager.registerForNotifications(name, cb);
     }
 
     public void unregisterForNotifications(String name, IServiceCallback cb)