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

Commit 03d0a367 authored by Wei Liu's avatar Wei Liu
Browse files

resolve merge conflicts of 82d5fc17 to master 

Test: device boots

Change-Id: I78e5667577e413763b6be3b06a2feda99ef0d739
parents f97de8b1 82d5fc17

services/core/java/com/android/server/am/ActivityManagerService.java

+3 −0
Original line number Diff line number Diff line
@@ -2291,6 +2291,9 @@ public final class ActivityManagerService extends ActivityManagerNative 
            } break;

            case VR_MODE_CHANGE_MSG: {

                VrManagerInternal vrService = LocalServices.getService(VrManagerInternal.class);

                if (vrService == null) {

                    break;

                }

                final ActivityRecord r = (ActivityRecord) msg.obj;

                boolean vrMode;

                ComponentName requestedPackage;

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

+6 −4
Original line number Diff line number Diff line
@@ -172,6 +172,7 @@ public class LightsService extends SystemService { 
        if (phase == PHASE_SYSTEM_SERVICES_READY) {

            IVrManager vrManager =

                    (IVrManager) getBinderService(VrManagerService.VR_MANAGER_BINDER_SERVICE);

            if (vrManager != null) {

                try {

                    vrManager.registerListener(mVrStateCallbacks);

                } catch (RemoteException e) {
@@ -179,6 +180,7 @@ public class LightsService extends SystemService { 
                }

            }

        }

    }



    private int getVrDisplayMode() {

        int currentUser = ActivityManager.getCurrentUser();

services/core/java/com/android/server/notification/NotificationManagerService.java

+0 −3
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ import com.android.server.lights.LightsManager; 
import com.android.server.notification.ManagedServices.ManagedServiceInfo;

import com.android.server.policy.PhoneWindowManager;

import com.android.server.statusbar.StatusBarManagerInternal;

import com.android.server.vr.VrManagerInternal;

import com.android.server.notification.ManagedServices.UserProfiles;



import libcore.io.IoUtils;
@@ -234,7 +233,6 @@ public class NotificationManagerService extends SystemService { 
    AudioManagerInternal mAudioManagerInternal;

    @Nullable StatusBarManagerInternal mStatusBar;

    Vibrator mVibrator;

    private VrManagerInternal mVrManagerInternal;

    private WindowManagerInternal mWindowManagerInternal;



    final IBinder mForegroundToken = new Binder();
@@ -1152,7 +1150,6 @@ public class NotificationManagerService extends SystemService { 
            // Grab our optional AudioService

            mAudioManager = (AudioManager) getContext().getSystemService(Context.AUDIO_SERVICE);

            mAudioManagerInternal = getLocalService(AudioManagerInternal.class);

            mVrManagerInternal = getLocalService(VrManagerInternal.class);

            mWindowManagerInternal = LocalServices.getService(WindowManagerInternal.class);

            mZenModeHelper.onSystemReady();

        } else if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {

services/core/java/com/android/server/power/PowerManagerService.java

+6 −4
Original line number Diff line number Diff line
@@ -650,11 +650,13 @@ public final class PowerManagerService extends SystemService 
                    false, mSettingsObserver, UserHandle.USER_ALL);

            IVrManager vrManager =

                    (IVrManager) getBinderService(VrManagerService.VR_MANAGER_BINDER_SERVICE);

            if (vrManager != null) {

                try {

                    vrManager.registerListener(mVrStateCallbacks);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Failed to register VR mode state listener: " + e);

                }

            }

            // Go.

            readConfigurationLocked();

            updateSettingsLocked();

services/java/com/android/server/SystemServer.java

+6 −3
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ public final class SystemServer { 
                false);



        boolean disableConsumerIr = SystemProperties.getBoolean("config.disable_consumerir", false);

        boolean disableVrManager = SystemProperties.getBoolean("config.disable_vrmanager", false);



        boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
@@ -677,9 +678,11 @@ public final class SystemServer { 
            ServiceManager.addService(Context.INPUT_SERVICE, inputManager);

            traceEnd();



            if (!disableVrManager) {

                traceBeginAndSlog("StartVrManagerService");

                mSystemServiceManager.startService(VrManagerService.class);

                traceEnd();

            }



            mActivityManagerService.setWindowManager(wm);