Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b5bdf0 authored by Steven Moreland's avatar Steven Moreland Committed by Android (Google) Code Review
Browse files

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

* changes:
  PowerManagerService: use waitForService.
  ServiceManagerProxy: add APIs.
parents 07dfc766 d9b00ae7
Loading
Loading
Loading
Loading
+10 −0
Original line number Original line Diff line number Diff line
@@ -76,6 +76,16 @@ class ServiceManagerProxy implements IServiceManager {
        return mServiceManager.listServices(dumpPriority);
        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.
     * Same as mServiceManager but used by apps.
     *
     *
+2 −7
Original line number Original line Diff line number Diff line
@@ -201,13 +201,8 @@ sp<ISystemSuspend> getSuspendHal() {
sp<ISuspendControlService> getSuspendControl() {
sp<ISuspendControlService> getSuspendControl() {
    static std::once_flag suspendControlFlag;
    static std::once_flag suspendControlFlag;
    std::call_once(suspendControlFlag, [](){
    std::call_once(suspendControlFlag, [](){
        while(gSuspendControl == nullptr) {
        gSuspendControl = waitForService<ISuspendControlService>(String16("suspend_control"));
            sp<IBinder> control =
        LOG_ALWAYS_FATAL_IF(gSuspendControl == nullptr);
                    defaultServiceManager()->getService(String16("suspend_control"));
            if (control != nullptr) {
                gSuspendControl = interface_cast<ISuspendControlService>(control);
            }
        }
    });
    });
    return gSuspendControl;
    return gSuspendControl;
}
}