Projects >> android-frameworks-base-with-screenshot-tweaks >>ed60f81940c5f2125518c7c31ad4f61b8a9baf3e

Chunk
Conflicting content
        mSafeModeEnabledVibePattern = getLongIntArray(mContext.getResources(),
                com.android.internal.R.array.config_safeModeEnabledVibePattern);

<<<<<<< HEAD
        // Note: the Configuration is not stable here, so we cannot load mStatusBarCanHide from
        // config_statusBarCanHide because the latter depends on the screen size

        // Controls rotation and the like.
        initializeHdmiState();
=======
        // watch for HDMI plug messages if the hdmi switch exists
        if (new File("/sys/devices/virtual/switch/hdmi/state").exists()) {
            mHDMIObserver.startObserving("DEVPATH=/devices/virtual/switch/hdmi");
        }
        mHdmiPlugged = !readHdmiState();
        setHdmiPlugged(!mHdmiPlugged);
>>>>>>> 76450622f08b1d0d09df7f1ad8e52afe01090770
    }

    public void setInitialDisplaySize(int width, int height) {
Solution content
        mSafeModeEnabledVibePattern = getLongIntArray(mContext.getResources(),
                com.android.internal.R.array.config_safeModeEnabledVibePattern);

        // Controls rotation and the like.
        initializeHdmiState();
    }

    public void setInitialDisplaySize(int width, int height) {
File
PhoneWindowManager.java
Developer's decision
Combination
Kind of conflict
Attribute
Comment
If statement
Method invocation