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

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

Merge "Disable VR compatibility display"

parents a15b75d0 396d8fb4

services/core/java/com/android/server/vr/VrManagerService.java

+0 −7
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import android.content.pm.FeatureInfo; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.PackageManager.NameNotFoundException;

import android.hardware.display.DisplayManager;

import android.os.Binder;

import android.os.Handler;

import android.os.IBinder;
@@ -138,7 +137,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC 
    private final NotificationAccessManager mNotifAccessManager = new NotificationAccessManager();

    /** Tracks the state of the screen and keyguard UI.*/

    private int mSystemSleepFlags = FLAG_NONE;

    private CompatibilityDisplay mCompatibilityDisplay;



    private static final int MSG_VR_STATE_CHANGE = 0;

    private static final int MSG_PENDING_VR_STATE_CHANGE = 1;
@@ -496,11 +494,6 @@ public class VrManagerService extends SystemService implements EnabledComponentC 


                mComponentObserver.rebuildAll();

            }



            DisplayManager dm =

                    (DisplayManager) getContext().getSystemService(Context.DISPLAY_SERVICE);

            mCompatibilityDisplay = new CompatibilityDisplay(dm, mVrManager);

            mCompatibilityDisplay.init();

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

            synchronized (mLock) {

                mVrModeAllowed = true;