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

Commit 11738a91 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aa am:... 

Merge "Use ILights.DESCRIPTOR to refer to AIDL HAL" am: 26b017aa am: 29016764 am: 8cb52df7 am: 94386f5b am: 73878f8c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426850

Change-Id: I56f55e55d51067bc778e1febab18d6a7da12bdb9
parents 6a100394 73878f8c

services/core/java/com/android/server/lights/LightsService.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -554,8 +554,8 @@ public class LightsService extends SystemService { 
        @Override

        @Override

        public synchronized ILights get() {

        public synchronized ILights get() {

            if (mInstance == null) {

            if (mInstance == null) {

                IBinder binder = Binder.allowBlocking(ServiceManager.waitForDeclaredService(

                IBinder binder = Binder.allowBlocking(

                        "android.hardware.light.ILights/default"));

                        ServiceManager.waitForDeclaredService(ILights.DESCRIPTOR + "/default"));

                if (binder != null) {

                if (binder != null) {

                    mInstance = ILights.Stub.asInterface(binder);

                    mInstance = ILights.Stub.asInterface(binder);

                    try {

                    try {