Projects >> platform_frameworks_base >>b0acb1e890959b616925ac89cbcdd22ed25e3252

Chunk
Conflicting content 
        synchronized(mWindowMap) {
            long ident = Binder.clearCallingIdentity();

<<<<<<< HEAD
            dw = mPolicy.getNonDecorDisplayWidth(mCurDisplayWidth);
            dh = mPolicy.getNonDecorDisplayHeight(mCurDisplayHeight);
=======
            dw = mCurDisplayWidth;
            dh = mCurDisplayHeight;
>>>>>>> f97ed771979162c4a2a75959c57fb793438a3a8b

            int aboveAppLayer = mPolicy.windowTypeToLayerLw(
                    WindowManager.LayoutParams.TYPE_APPLICATION) * TYPE_LAYER_MULTIPLIER
Solution content 
        synchronized(mWindowMap) {
            long ident = Binder.clearCallingIdentity();

            dw = mPolicy.getNonDecorDisplayWidth(mCurDisplayWidth);
            dh = mPolicy.getNonDecorDisplayHeight(mCurDisplayHeight);

            int aboveAppLayer = mPolicy.windowTypeToLayerLw(
                    WindowManager.LayoutParams.TYPE_APPLICATION) * TYPE_LAYER_MULTIPLIER
File
WindowManagerService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable
Chunk
Conflicting content 
            mInitialDisplayWidth = mCurDisplayWidth = mDisplay.getRealWidth();
            mInitialDisplayHeight = mCurDisplayHeight = mDisplay.getRealHeight();
            mInputManager.setDisplaySize(0, mDisplay.getRawWidth(), mDisplay.getRawHeight());
<<<<<<< HEAD
            mPolicy.setInitialDisplaySize(mInitialDisplayWidth, mInitialDisplayHeight);
=======
>>>>>>> f97ed771979162c4a2a75959c57fb793438a3a8b
        }

        try {
Solution content 
            mInitialDisplayWidth = mCurDisplayWidth = mDisplay.getRealWidth();
            mInitialDisplayHeight = mCurDisplayHeight = mDisplay.getRealHeight();
            mInputManager.setDisplaySize(0, mDisplay.getRawWidth(), mDisplay.getRawHeight());
            mPolicy.setInitialDisplaySize(mInitialDisplayWidth, mInitialDisplayHeight);
        }

        try {
File
WindowManagerService.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        }

        final long currentTime = SystemClock.uptimeMillis();
<<<<<<< HEAD
        final int dw = mCurDisplayWidth;
        final int dh = mCurDisplayHeight;
=======
        final int dw = mCurDisplayWidth = mDisplay.getRealWidth();
        final int dh = mCurDisplayHeight = mDisplay.getRealHeight();
>>>>>>> f97ed771979162c4a2a75959c57fb793438a3a8b

        final int innerDw = mPolicy.getNonDecorDisplayWidth(dw);
        final int innerDh = mPolicy.getNonDecorDisplayHeight(dh);
Solution content 
        }

        final long currentTime = SystemClock.uptimeMillis();
        final int dw = mCurDisplayWidth;
        final int dh = mCurDisplayHeight;

        final int innerDw = mPolicy.getNonDecorDisplayWidth(dw);
        final int innerDh = mPolicy.getNonDecorDisplayHeight(dh);
File
WindowManagerService.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Variable