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

Commit 8deb67cb authored by Craig Donner's avatar Craig Donner
Browse files

Use the Context name to publish and use vrmanager 

Bug: 34736524
Test: build
Change-Id: I8aabb4d242fb2378b24dd30a972c382a7f8f4934
parent 697221e8

packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java

+4 −2
Original line number Diff line number Diff line
@@ -295,8 +295,10 @@ public class BrightnessController implements ToggleSlider.Listener { 


        mAutomaticAvailable = context.getResources().getBoolean(

                com.android.internal.R.bool.config_automatic_brightness_available);

        mPower = IPowerManager.Stub.asInterface(ServiceManager.getService("power"));

        mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));

        mPower = IPowerManager.Stub.asInterface(ServiceManager.getService(

                Context.POWER_SERVICE));

        mVrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

                Context.VR_SERVICE));

    }



    public void addStateChangedCallback(BrightnessStateChangeCallback cb) {

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+2 −1
Original line number Diff line number Diff line
@@ -894,7 +894,8 @@ public class StatusBar extends SystemUI implements DemoMode, 
                null, null);

        updateCurrentProfilesCache();



        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));

        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

                Context.VR_SERVICE));

        try {

            vrManager.registerListener(mVrStateCallbacks);

        } catch (RemoteException e) {

services/core/java/com/android/server/UiModeManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -772,7 +772,8 @@ final class UiModeManagerService extends SystemService { 
    }



    private void registerVrStateListener() {

        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService("vrmanager"));

        IVrManager vrManager = IVrManager.Stub.asInterface(ServiceManager.getService(

                Context.VR_SERVICE));

        try {

            if (vrManager != null) {

                vrManager.registerListener(mVrStateCallbacks);

services/core/java/com/android/server/display/NightDisplayService.java

+1 −2
Original line number Diff line number Diff line
@@ -141,8 +141,7 @@ public final class NightDisplayService extends SystemService 
    @Override

    public void onBootPhase(int phase) {

        if (phase == PHASE_SYSTEM_SERVICES_READY) {

            IVrManager vrManager =

                    (IVrManager) getBinderService(VrManagerService.VR_MANAGER_BINDER_SERVICE);

            IVrManager vrManager = (IVrManager) getBinderService(Context.VR_SERVICE);

            if (vrManager != null) {

                try {

                    vrManager.registerListener(mVrStateCallbacks);

services/core/java/com/android/server/policy/ImmersiveModeConfirmation.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class ImmersiveModeConfirmation { 


    void systemReady() {

        IVrManager vrManager = IVrManager.Stub.asInterface(

                ServiceManager.getService(VrManagerService.VR_MANAGER_BINDER_SERVICE));

                ServiceManager.getService(Context.VR_SERVICE));

        if (vrManager != null) {

            try {

                vrManager.registerListener(mVrStateCallbacks);