summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2021-04-21 21:36:38 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-21 21:36:38 +0000
commit3b44e581457e11101da346589d551b34cbabe52c (patch)
tree29ec6d5d6d1b11f9139263772bc61a7cfa0326fe /core/java/android
parent19fb7324161549ae2fde38d10ed92d8d9c0b0734 (diff)
parent50dda4bb15a4d659104bec6368194522ab670dda (diff)
Merge "ServiceManagerNative: update for updatableViaApex" am: 0da4dcceea am: b763d9fbb6 am: 50dda4bb15
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1682064 Change-Id: I7f25599c5ebe6759f7001194d401e0bbc191ffd9
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/ServiceManagerNative.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/java/android/os/ServiceManagerNative.java b/core/java/android/os/ServiceManagerNative.java
index 60acc57d0cfe..755c35f4767a 100644
--- a/core/java/android/os/ServiceManagerNative.java
+++ b/core/java/android/os/ServiceManagerNative.java
@@ -94,6 +94,10 @@ class ServiceManagerProxy implements IServiceManager {
return mServiceManager.getDeclaredInstances(iface);
}
+ public String updatableViaApex(String name) throws RemoteException {
+ return mServiceManager.updatableViaApex(name);
+ }
+
public void registerClientCallback(String name, IBinder service, IClientCallback cb)
throws RemoteException {
throw new RemoteException();