Projects >> android-frameworks-base-with-remote-control-service >>2996adb765fe34cf12744019d60b3db86fb31295

Chunk
Conflicting content 
                    return mSeascapeRotation;
                case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE:
                    //return either landscape rotation based on the sensor
<<<<<<< HEAD
                    return getCurrentLandscapeRotation(lastRotation);
                case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:
=======
                    mOrientationListener.setAllow180Rotation(
                            isLandscapeOrSeascape(Surface.ROTATION_180));
                    return getCurrentLandscapeRotation(lastRotation);
                case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:
                    mOrientationListener.setAllow180Rotation(
                            !isLandscapeOrSeascape(Surface.ROTATION_180));
>>>>>>> e9acc40151db2c5ec3c958c206f7c2e805709e29
                    return getCurrentPortraitRotation(lastRotation);
            }
Solution content 
                    return mSeascapeRotation;
                case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE:
                    //return either landscape rotation based on the sensor
                    return getCurrentLandscapeRotation(lastRotation);
                case ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT:
                    return getCurrentPortraitRotation(lastRotation);
            }
File
PhoneWindowManager.java
Developer's decision
Version 1
Kind of conflict
Case statement
Method invocation
Return statement