Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "wait-for-aidl" into stage-aosp-master

Browse Source 
* changes:
  PowerManagerService: use waitForService.
  ServiceManagerProxy: add APIs.
This commit is contained in:
Steven Moreland
2019-08-30 17:54:37 +00:00
committed by Android (Google) Code Review
parent 07dfc766d8 d9b00ae794
commit d6b5bdf07d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/os/ServiceManagerNative.java
View File

@@ -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.
*

9
services/core/jni/com_android_server_power_PowerManagerService.cpp
View File

@@ -201,13 +201,8 @@ sp<ISystemSuspend> getSuspendHal() {
sp<ISuspendControlService> getSuspendControl() {
static std::once_flag suspendControlFlag;
std::call_once(suspendControlFlag, [](){
while(gSuspendControl == nullptr) {
sp<IBinder> control =
defaultServiceManager()->getService(String16("suspend_control"));
if (control != nullptr) {
gSuspendControl = interface_cast<ISuspendControlService>(control);
}
}
gSuspendControl = waitForService<ISuspendControlService>(String16("suspend_control"));
LOG_ALWAYS_FATAL_IF(gSuspendControl == nullptr);
});
return gSuspendControl;
}