Merge changes from topic "wait-for-aidl" into stage-aosp-master am: d6b5bdf07d am: 4955049ace

am: 11912440c5 Change-Id: I9997004285d1299742c50b222edf9301be09fc98
2019-08-30 11:48:29 -07:00
parent ecce45c3ab 11912440c5
commit fac32905f9
2 changed files with 12 additions and 7 deletions
--- a/core/java/android/os/ServiceManagerNative.java
+++ b/core/java/android/os/ServiceManagerNative.java
@@ -76,6 +76,16 @@ class ServiceManagerProxy implements IServiceManager {
        return mServiceManager.listServices(dumpPriority);
    }

+    public void registerForNotifications(String name, IServiceCallback cb)
+            throws RemoteException {
+        throw new RemoteException();
+    }
+
+    public void unregisterForNotifications(String name, IServiceCallback cb)
+            throws RemoteException {
+        throw new RemoteException();
+    }
+
    /**
     * Same as mServiceManager but used by apps.
     *