Projects >> android-frameworks-base >>e570a0fa86c2eea2680f07e2c0c546f104bea948

Chunk
Conflicting content 
        mNewSurfaceNeeded = true;
        updateWindow(false);
    }
<<<<<<< HEAD
    
=======

>>>>>>> b798689749c64baba81f02e10cf2157c747d6b46
    private static class MyWindow extends IWindow.Stub {
        private WeakReference mSurfaceView;
Solution content 
        mNewSurfaceNeeded = true;
        updateWindow(false);
    }

    private static class MyWindow extends IWindow.Stub {
        private WeakReference mSurfaceView;
File
SurfaceView.java
Developer's decision
Version 1
Kind of conflict
Blank
Chunk
Conflicting content 
            if (surfaceView != null) {
                if (localLOGV) Log.v(
                        "SurfaceView", surfaceView + " got resized: w=" +
<<<<<<< HEAD
                        w + " h=" + h + ", cur w=" + mCurWidth + " h=" + 
                        mCurHeight);
=======
                                w + " h=" + h + ", cur w=" + mCurWidth + " h=" + mCurHeight);
>>>>>>> b798689749c64baba81f02e10cf2157c747d6b46
                synchronized (this) {
                    if (mCurWidth != w || mCurHeight != h) {
                        mCurWidth = w;
Solution content 
            if (surfaceView != null) {
                if (localLOGV) Log.v(
                        "SurfaceView", surfaceView + " got resized: w=" +
                                w + " h=" + h + ", cur w=" + mCurWidth + " h=" + mCurHeight);
                synchronized (this) {
                    if (mCurWidth != w || mCurHeight != h) {
                        mCurWidth = w;
File
SurfaceView.java
Developer's decision
Version 1
Kind of conflict
Variable
Chunk
Conflicting content 
                    }
                    if (reportDraw) {
                        try {
<<<<<<< HEAD
                            surfaceView.mSession.finishDrawing(
                                    surfaceView.mWindow);
=======
                            surfaceView.mSession.finishDrawing(surfaceView.mWindow);
>>>>>>> b798689749c64baba81f02e10cf2157c747d6b46
                        } catch (RemoteException e) {
                        }
                    }
Solution content 
                    }
                    if (reportDraw) {
                        try {
                            surfaceView.mSession.finishDrawing(surfaceView.mWindow);
                        } catch (RemoteException e) {
                        }
                    }
File
SurfaceView.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
        public void dispatchKey(KeyEvent event) {
            SurfaceView surfaceView = mSurfaceView.get();
            if (surfaceView != null) {
<<<<<<< HEAD
                //Log.w("SurfaceView", "Unexpected key event in surface: " 
                // + event);
                if (surfaceView.mSession != null && surfaceView.mSurface != 
                        null) {
=======
                //Log.w("SurfaceView", "Unexpected key event in surface: " + event);
                if (surfaceView.mSession != null && surfaceView.mSurface != null) {
>>>>>>> b798689749c64baba81f02e10cf2157c747d6b46
                    try {
                        surfaceView.mSession.finishKey(surfaceView.mWindow);
                    } catch (RemoteException ex) {
Solution content 
        public void dispatchKey(KeyEvent event) {
            SurfaceView surfaceView = mSurfaceView.get();
            if (surfaceView != null) {
                //Log.w("SurfaceView", "Unexpected key event in surface: " + event);
                if (surfaceView.mSession != null && surfaceView.mSurface != null) {
                    try {
                        surfaceView.mSession.finishKey(surfaceView.mWindow);
                    } catch (RemoteException ex) {
File
SurfaceView.java
Developer's decision
Version 2
Kind of conflict
Comment
If statement
Chunk
Conflicting content 
        public void dispatchGetNewSurface() {
            SurfaceView surfaceView = mSurfaceView.get();
            if (surfaceView != null) {
<<<<<<< HEAD
                Message msg = surfaceView.mHandler.obtainMessage(
                        GET_NEW_SURFACE_MSG);
                surfaceView.mHandler.sendMessage(msg); 
=======
                Message msg = surfaceView.mHandler.obtainMessage(GET_NEW_SURFACE_MSG);
                surfaceView.mHandler.sendMessage(msg);
>>>>>>> b798689749c64baba81f02e10cf2157c747d6b46
            }
        }
Solution content 
        public void dispatchGetNewSurface() {
            SurfaceView surfaceView = mSurfaceView.get();
            if (surfaceView != null) {
                Message msg = surfaceView.mHandler.obtainMessage(GET_NEW_SURFACE_MSG);
                surfaceView.mHandler.sendMessage(msg);
            }
        }
File
SurfaceView.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable