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

Commit 5e6a03d3 authored by Rupesh Bansal's avatar Rupesh Bansal Committed by Android (Google) Code Review
Browse files

Merge "Remove VR features"

parents df36fccf 7996c6b8

core/java/android/hardware/display/DisplayManagerInternal.java

+0 −8
Original line number Diff line number Diff line
@@ -423,8 +423,6 @@ public abstract class DisplayManagerInternal { 
        public static final int POLICY_DIM = 2;

        // Policy: Make the screen bright as usual.

        public static final int POLICY_BRIGHT = 3;

        // Policy: Keep the screen and display optimized for VR mode.

        public static final int POLICY_VR = 4;



        // The basic overall policy to apply: off, doze, dim or bright.

        public int policy;
@@ -489,10 +487,6 @@ public abstract class DisplayManagerInternal { 
            return policy == POLICY_BRIGHT || policy == POLICY_DIM;

        }



        public boolean isVr() {

            return policy == POLICY_VR;

        }



        public void copyFrom(DisplayPowerRequest other) {

            policy = other.policy;

            useProximitySensor = other.useProximitySensor;
@@ -566,8 +560,6 @@ public abstract class DisplayManagerInternal { 
                    return "DIM";

                case POLICY_BRIGHT:

                    return "BRIGHT";

                case POLICY_VR:

                    return "VR";

                default:

                    return Integer.toString(policy);

            }

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

+1 −2
Original line number Diff line number Diff line
@@ -483,8 +483,7 @@ class AutomaticBrightnessController { 


    private static boolean isInteractivePolicy(int policy) {

        return policy == DisplayPowerRequest.POLICY_BRIGHT

                || policy == DisplayPowerRequest.POLICY_DIM

                || policy == DisplayPowerRequest.POLICY_VR;

                || policy == DisplayPowerRequest.POLICY_DIM;

    }



    private boolean setScreenBrightnessByUser(float brightness) {

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

+2 −74
Original line number Diff line number Diff line
@@ -219,15 +219,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 


    private final float mScreenBrightnessDefault;



    // The minimum allowed brightness while in VR.

    private final float mScreenBrightnessForVrRangeMinimum;



    // The maximum allowed brightness while in VR.

    private final float mScreenBrightnessForVrRangeMaximum;



    // The default screen brightness for VR.

    private final float mScreenBrightnessForVrDefault;



    // True if auto-brightness should be used.

    private boolean mUseSoftwareAutoBrightnessConfig;
@@ -450,9 +441,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
    // PowerManager.BRIGHTNESS_INVALID_FLOAT when there's no temporary brightness set.

    private float mTemporaryScreenBrightness;



    // The current screen brightness while in VR mode.

    private float mScreenBrightnessForVr;



    // The last auto brightness adjustment that was set by the user and not temporary. Set to

    // Float.NaN when an auto-brightness adjustment hasn't been recorded yet.

    private float mAutoBrightnessAdjustment;
@@ -563,14 +551,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        mScreenBrightnessDefault = clampAbsoluteBrightness(

                mLogicalDisplay.getDisplayInfoLocked().brightnessDefault);



        // VR SETTINGS

        mScreenBrightnessForVrDefault = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR));

        mScreenBrightnessForVrRangeMaximum = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR));

        mScreenBrightnessForVrRangeMinimum = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR));



        mAllowAutoBrightnessWhileDozingConfig = resources.getBoolean(

                com.android.internal.R.bool.config_allowAutoBrightnessWhileDozing);
@@ -643,7 +623,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        loadProximitySensor();



        mCurrentScreenBrightnessSetting = getScreenBrightnessSetting();

        mScreenBrightnessForVr = getScreenBrightnessForVrSetting();

        mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        mTemporaryScreenBrightness = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;
@@ -948,9 +927,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        };



        mBrightnessSetting.registerListener(mBrightnessSettingListener);

        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT),

                false /*notifyForDescendants*/, mSettingsObserver, UserHandle.USER_ALL);

        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ),

                false /*notifyForDescendants*/, mSettingsObserver, UserHandle.USER_ALL);
@@ -1271,9 +1247,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    mBrightnessReasonTemp.setReason(BrightnessReason.REASON_DOZE);

                }

                break;

            case DisplayPowerRequest.POLICY_VR:

                state = Display.STATE_VR;

                break;

            case DisplayPowerRequest.POLICY_DIM:

            case DisplayPowerRequest.POLICY_BRIGHT:

            default:
@@ -1351,12 +1324,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
            mBrightnessReasonTemp.setReason(BrightnessReason.REASON_SCREEN_OFF);

        }



        // Always use the VR brightness when in the VR state.

        if (state == Display.STATE_VR) {

            brightnessState = mScreenBrightnessForVr;

            mBrightnessReasonTemp.setReason(BrightnessReason.REASON_VR);

        }



        if ((Float.isNaN(brightnessState))

                && isValidBrightnessValue(mPowerRequest.screenBrightnessOverride)) {

            brightnessState = mPowerRequest.screenBrightnessOverride;
@@ -1575,7 +1542,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                mBrightnessThrottler.getBrightnessMaxReason());



        // Animate the screen brightness when the screen is on or dozing.

        // Skip the animation when the screen is off or suspended or transition to/from VR.

        // Skip the animation when the screen is off.

        boolean brightnessAdjusted = false;

        final boolean brightnessIsTemporary =

                mAppliedTemporaryBrightness || mAppliedTemporaryAutoBrightnessAdjustment;
@@ -1598,8 +1565,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                }

            }



            final boolean wasOrWillBeInVr =

                    (state == Display.STATE_VR || oldState == Display.STATE_VR);

            final boolean initialRampSkip = (state == Display.STATE_ON && mSkipRampState

                    != RAMP_STATE_SKIP_NONE) || skipRampBecauseOfProximityChangeToNegative;

            // While dozing, sometimes the brightness is split into buckets. Rather than animating
@@ -1641,7 +1606,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                    && (animateValue != currentBrightness

                    || sdrAnimateValue != currentSdrBrightness)) {

                if (initialRampSkip || hasBrightnessBuckets

                        || wasOrWillBeInVr || !isDisplayContentVisible || brightnessIsTemporary) {

                        || !isDisplayContentVisible || brightnessIsTemporary) {

                    animateScreenBrightness(animateValue, sdrAnimateValue,

                            SCREEN_ANIMATION_RATE_MINIMUM);

                } else {
@@ -2078,12 +2043,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        }

    }



    private float clampScreenBrightnessForVr(float value) {

        return MathUtils.constrain(

                value, mScreenBrightnessForVrRangeMinimum,

                mScreenBrightnessForVrRangeMaximum);

    }



    private float clampScreenBrightness(float value) {

        if (Float.isNaN(value)) {

            value = PowerManager.BRIGHTNESS_MIN;
@@ -2172,23 +2131,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                mPowerState.setColorFadeLevel(1.0f);

                mPowerState.dismissColorFade();

            }

        } else if (target == Display.STATE_VR) {

            // Wait for brightness animation to complete beforehand when entering VR

            // from screen on to prevent a perceptible jump because brightness may operate

            // differently when the display is configured for dozing.

            if (mScreenBrightnessRampAnimator.isAnimating()

                    && mPowerState.getScreenState() == Display.STATE_ON) {

                return;

            }



            // Set screen state.

            if (!setScreenState(Display.STATE_VR)) {

                return; // screen on blocked

            }



            // Dismiss the black surface without fanfare.

            mPowerState.setColorFadeLevel(1.0f);

            mPowerState.dismissColorFade();

        } else if (target == Display.STATE_DOZE) {

            // Want screen dozing.

            // Wait for brightness animation to complete beforehand when entering doze
@@ -2396,9 +2338,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
                mAutomaticBrightnessController.resetShortTermModel();

            }

        }

        // We don't bother with a pending variable for VR screen brightness since we just

        // immediately adapt to it.

        mScreenBrightnessForVr = getScreenBrightnessForVrSetting();

        sendUpdatePowerState();

    }
@@ -2417,13 +2356,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        return clampAbsoluteBrightness(brightness);

    }



    private float getScreenBrightnessForVrSetting() {

        final float brightnessFloat = Settings.System.getFloatForUser(mContext.getContentResolver(),

                Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, mScreenBrightnessForVrDefault,

                UserHandle.USER_CURRENT);

        return clampScreenBrightnessForVr(brightnessFloat);

    }



    @Override

    public void setBrightness(float brightnessValue) {

        // Update the setting, which will eventually call back into DPC to have us actually update
@@ -2597,9 +2529,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        pw.println("  mScreenBrightnessRangeDefault=" + mScreenBrightnessDefault);

        pw.println("  mScreenBrightnessDozeConfig=" + mScreenBrightnessDozeConfig);

        pw.println("  mScreenBrightnessDimConfig=" + mScreenBrightnessDimConfig);

        pw.println("  mScreenBrightnessForVrRangeMinimum=" + mScreenBrightnessForVrRangeMinimum);

        pw.println("  mScreenBrightnessForVrRangeMaximum=" + mScreenBrightnessForVrRangeMaximum);

        pw.println("  mScreenBrightnessForVrDefault=" + mScreenBrightnessForVrDefault);

        pw.println("  mUseSoftwareAutoBrightnessConfig=" + mUseSoftwareAutoBrightnessConfig);

        pw.println("  mAllowAutoBrightnessWhileDozingConfig="

                + mAllowAutoBrightnessWhileDozingConfig);
@@ -2649,7 +2578,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call 
        pw.println("  mBrightnessReason=" + mBrightnessReason);

        pw.println("  mTemporaryAutoBrightnessAdjustment=" + mTemporaryAutoBrightnessAdjustment);

        pw.println("  mPendingAutoBrightnessAdjustment=" + mPendingAutoBrightnessAdjustment);

        pw.println("  mScreenBrightnessForVrFloat=" + mScreenBrightnessForVr);

        pw.println("  mAppliedAutoBrightness=" + mAppliedAutoBrightness);

        pw.println("  mAppliedDimming=" + mAppliedDimming);

        pw.println("  mAppliedLowPower=" + mAppliedLowPower);

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

+2 −74
Original line number Diff line number Diff line
@@ -198,15 +198,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 


    private final float mScreenBrightnessDefault;



    // The minimum allowed brightness while in VR.

    private final float mScreenBrightnessForVrRangeMinimum;



    // The maximum allowed brightness while in VR.

    private final float mScreenBrightnessForVrRangeMaximum;



    // The default screen brightness for VR.

    private final float mScreenBrightnessForVrDefault;



    // True if auto-brightness should be used.

    private boolean mUseSoftwareAutoBrightnessConfig;
@@ -394,9 +385,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
    // behalf of the user.

    private float mCurrentScreenBrightnessSetting;



    // The current screen brightness while in VR mode.

    private float mScreenBrightnessForVr;



    // The last auto brightness adjustment that was set by the user and not temporary. Set to

    // Float.NaN when an auto-brightness adjustment hasn't been recorded yet.

    private float mAutoBrightnessAdjustment;
@@ -488,14 +476,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mScreenBrightnessDefault = clampAbsoluteBrightness(

                mLogicalDisplay.getDisplayInfoLocked().brightnessDefault);



        // VR SETTINGS

        mScreenBrightnessForVrDefault = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_DEFAULT_VR));

        mScreenBrightnessForVrRangeMaximum = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MAXIMUM_VR));

        mScreenBrightnessForVrRangeMinimum = clampAbsoluteBrightness(

                pm.getBrightnessConstraint(PowerManager.BRIGHTNESS_CONSTRAINT_TYPE_MINIMUM_VR));



        loadBrightnessRampRates();

        mSkipScreenOnBrightnessRamp = resources.getBoolean(

                R.bool.config_skipScreenOnBrightnessRamp);
@@ -562,7 +542,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        mDisplayBrightnessController =

                new DisplayBrightnessController(context, null, mDisplayId);

        mCurrentScreenBrightnessSetting = getScreenBrightnessSetting();

        mScreenBrightnessForVr = getScreenBrightnessForVrSetting();

        mAutoBrightnessAdjustment = getAutoBrightnessAdjustmentSetting();

        mPendingScreenBrightnessSetting = PowerManager.BRIGHTNESS_INVALID_FLOAT;

        mTemporaryAutoBrightnessAdjustment = PowerManager.BRIGHTNESS_INVALID_FLOAT;
@@ -861,9 +840,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        };



        mBrightnessSetting.registerListener(mBrightnessSettingListener);

        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT),

                false /*notifyForDescendants*/, mSettingsObserver, UserHandle.USER_ALL);

        mContext.getContentResolver().registerContentObserver(

                Settings.System.getUriFor(Settings.System.SCREEN_AUTO_BRIGHTNESS_ADJ),

                false /*notifyForDescendants*/, mSettingsObserver, UserHandle.USER_ALL);
@@ -1163,9 +1139,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    state = Display.STATE_DOZE;

                }

                break;

            case DisplayPowerRequest.POLICY_VR:

                state = Display.STATE_VR;

                break;

            case DisplayPowerRequest.POLICY_DIM:

            case DisplayPowerRequest.POLICY_BRIGHT:

            default:
@@ -1199,12 +1172,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        float brightnessState = displayBrightnessState.getBrightness();

        mBrightnessReasonTemp.set(displayBrightnessState.getBrightnessReason());



        // Always use the VR brightness when in the VR state.

        if (state == Display.STATE_VR) {

            brightnessState = mScreenBrightnessForVr;

            mBrightnessReasonTemp.setReason(BrightnessReason.REASON_VR);

        }



        final boolean autoBrightnessEnabledInDoze =

                mDisplayBrightnessController.isAllowAutoBrightnessWhileDozingConfig()

                        && Display.isDozeState(state);
@@ -1405,7 +1372,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mBrightnessThrottler.getBrightnessMaxReason());



        // Animate the screen brightness when the screen is on or dozing.

        // Skip the animation when the screen is off or suspended or transition to/from VR.

        // Skip the animation when the screen is off or suspended.

        boolean brightnessAdjusted = false;

        final boolean brightnessIsTemporary =

                (mBrightnessReason.getReason() == BrightnessReason.REASON_TEMPORARY)
@@ -1429,8 +1396,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                }

            }



            final boolean wasOrWillBeInVr =

                    (state == Display.STATE_VR || oldState == Display.STATE_VR);

            final boolean initialRampSkip = (state == Display.STATE_ON && mSkipRampState

                    != RAMP_STATE_SKIP_NONE) || mDisplayPowerProximityStateController

                    .shouldSkipRampBecauseOfProximityChangeToNegative();
@@ -1473,7 +1438,7 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                    && (animateValue != currentBrightness

                    || sdrAnimateValue != currentSdrBrightness)) {

                if (initialRampSkip || hasBrightnessBuckets

                        || wasOrWillBeInVr || !isDisplayContentVisible || brightnessIsTemporary) {

                        || !isDisplayContentVisible || brightnessIsTemporary) {

                    animateScreenBrightness(animateValue, sdrAnimateValue,

                            SCREEN_ANIMATION_RATE_MINIMUM);

                } else {
@@ -1886,12 +1851,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                fallbackType);

    }



    private float clampScreenBrightnessForVr(float value) {

        return MathUtils.constrain(

                value, mScreenBrightnessForVrRangeMinimum,

                mScreenBrightnessForVrRangeMaximum);

    }



    private float clampScreenBrightness(float value) {

        if (Float.isNaN(value)) {

            value = PowerManager.BRIGHTNESS_MIN;
@@ -1980,23 +1939,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mPowerState.setColorFadeLevel(1.0f);

                mPowerState.dismissColorFade();

            }

        } else if (target == Display.STATE_VR) {

            // Wait for brightness animation to complete beforehand when entering VR

            // from screen on to prevent a perceptible jump because brightness may operate

            // differently when the display is configured for dozing.

            if (mScreenBrightnessRampAnimator.isAnimating()

                    && mPowerState.getScreenState() == Display.STATE_ON) {

                return;

            }



            // Set screen state.

            if (!setScreenState(Display.STATE_VR)) {

                return; // screen on blocked

            }



            // Dismiss the black surface without fanfare.

            mPowerState.setColorFadeLevel(1.0f);

            mPowerState.dismissColorFade();

        } else if (target == Display.STATE_DOZE) {

            // Want screen dozing.

            // Wait for brightness animation to complete beforehand when entering doze
@@ -2113,9 +2055,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
                mAutomaticBrightnessController.resetShortTermModel();

            }

        }

        // We don't bother with a pending variable for VR screen brightness since we just

        // immediately adapt to it.

        mScreenBrightnessForVr = getScreenBrightnessForVrSetting();

        sendUpdatePowerState();

    }
@@ -2134,13 +2073,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        return clampAbsoluteBrightness(brightness);

    }



    private float getScreenBrightnessForVrSetting() {

        final float brightnessFloat = Settings.System.getFloatForUser(mContext.getContentResolver(),

                Settings.System.SCREEN_BRIGHTNESS_FOR_VR_FLOAT, mScreenBrightnessForVrDefault,

                UserHandle.USER_CURRENT);

        return clampScreenBrightnessForVr(brightnessFloat);

    }



    @Override

    public void setBrightness(float brightnessValue) {

        // Update the setting, which will eventually call back into DPC to have us actually update
@@ -2254,9 +2186,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        pw.println("  mScreenBrightnessRangeDefault=" + mScreenBrightnessDefault);

        pw.println("  mScreenBrightnessDozeConfig=" + mScreenBrightnessDozeConfig);

        pw.println("  mScreenBrightnessDimConfig=" + mScreenBrightnessDimConfig);

        pw.println("  mScreenBrightnessForVrRangeMinimum=" + mScreenBrightnessForVrRangeMinimum);

        pw.println("  mScreenBrightnessForVrRangeMaximum=" + mScreenBrightnessForVrRangeMaximum);

        pw.println("  mScreenBrightnessForVrDefault=" + mScreenBrightnessForVrDefault);

        pw.println("  mUseSoftwareAutoBrightnessConfig=" + mUseSoftwareAutoBrightnessConfig);

        pw.println("  mSkipScreenOnBrightnessRamp=" + mSkipScreenOnBrightnessRamp);

        pw.println("  mColorFadeFadesConfig=" + mColorFadeFadesConfig);
@@ -2292,7 +2221,6 @@ final class DisplayPowerController2 implements AutomaticBrightnessController.Cal 
        pw.println("  mBrightnessReason=" + mBrightnessReason);

        pw.println("  mTemporaryAutoBrightnessAdjustment=" + mTemporaryAutoBrightnessAdjustment);

        pw.println("  mPendingAutoBrightnessAdjustment=" + mPendingAutoBrightnessAdjustment);

        pw.println("  mScreenBrightnessForVrFloat=" + mScreenBrightnessForVr);

        pw.println("  mAppliedAutoBrightness=" + mAppliedAutoBrightness);

        pw.println("  mAppliedDimming=" + mAppliedDimming);

        pw.println("  mAppliedLowPower=" + mAppliedLowPower);

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

+1 −26
Original line number Diff line number Diff line
@@ -762,18 +762,8 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                            }

                        }



                        // If the state change was from or to VR, then we need to tell the light

                        // so that it can apply appropriate VR brightness settings. Also, update the

                        // brightness so the state is propogated to light.

                        boolean vrModeChange = false;

                        if ((state == Display.STATE_VR || currentState == Display.STATE_VR) &&

                                currentState != state) {

                            setVrMode(state == Display.STATE_VR);

                            vrModeChange = true;

                        }



                        // Apply brightness changes given that we are in a non-suspended state.

                        if (brightnessChanged || vrModeChange) {

                        if (brightnessChanged) {

                            setDisplayBrightness(brightnessState, sdrBrightnessState);

                            mBrightnessState = brightnessState;

                            mSdrBrightnessState = sdrBrightnessState;
@@ -785,15 +775,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
                        }

                    }



                    private void setVrMode(boolean isVrEnabled) {

                        if (DEBUG) {

                            Slog.d(TAG, "setVrMode("

                                    + "id=" + physicalDisplayId

                                    + ", state=" + Display.stateToString(state) + ")");

                        }

                        mBacklightAdapter.setVrMode(isVrEnabled);

                    }



                    private void setDisplayState(int state) {

                        if (DEBUG) {

                            Slog.d(TAG, "setDisplayState("
@@ -1505,12 +1486,6 @@ final class LocalDisplayAdapter extends DisplayAdapter { 
            }

        }



        void setVrMode(boolean isVrModeEnabled) {

            if (mBacklight != null) {

                mBacklight.setVrMode(isVrModeEnabled);

            }

        }



        void setForceSurfaceControl(boolean forceSurfaceControl) {

            mForceSurfaceControl = forceSurfaceControl;

        }