Projects information

Chunk

Conflicting content
return true; } return true; } <<<<<<< HEAD case SWITCH_USER_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int userid = data.readInt(); boolean result = switchUser(userid); reply.writeNoException(); reply.writeInt(result ? 1 : 0); return true; } case REMOVE_SUB_TASK_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int taskId = data.readInt(); int subTaskIndex = data.readInt(); boolean result = removeSubTask(taskId, subTaskIndex); reply.writeNoException(); reply.writeInt(result ? 1 : 0); case REMOVE_TASK_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int taskId = data.readInt(); int fl = data.readInt(); boolean result = removeTask(taskId, fl); reply.writeNoException(); reply.writeInt(result ? 1 : 0); ======= case SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); String pkg = data.readString(); boolean enabled = data.readInt() != 0; setPackageScreenCompatMode(pkg, enabled); reply.writeNoException(); >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a return true; }

Conflicting content

            return true;
        }
            return true;
        }

<<<<<<< HEAD
        case SWITCH_USER_TRANSACTION: {
            data.enforceInterface(IActivityManager.descriptor);
            int userid = data.readInt();
            boolean result = switchUser(userid);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
            return true;
        }
        
        case REMOVE_SUB_TASK_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            int taskId = data.readInt();
            int subTaskIndex = data.readInt();
            boolean result = removeSubTask(taskId, subTaskIndex);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
        case REMOVE_TASK_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            int taskId = data.readInt();
            int fl = data.readInt();
            boolean result = removeTask(taskId, fl);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
=======
        case SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            String pkg = data.readString();
            boolean enabled = data.readInt() != 0;
            setPackageScreenCompatMode(pkg, enabled);
            reply.writeNoException();
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
            return true;
        }

Solution content
return true; } case SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); String pkg = data.readString(); boolean enabled = data.readInt() != 0; setPackageScreenCompatMode(pkg, enabled); reply.writeNoException(); return true; } case SWITCH_USER_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int userid = data.readInt(); boolean result = switchUser(userid); reply.writeNoException(); reply.writeInt(result ? 1 : 0); return true; } case REMOVE_SUB_TASK_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int taskId = data.readInt(); int subTaskIndex = data.readInt(); boolean result = removeSubTask(taskId, subTaskIndex); reply.writeNoException(); reply.writeInt(result ? 1 : 0); return true; } case REMOVE_TASK_TRANSACTION: { data.enforceInterface(IActivityManager.descriptor); int taskId = data.readInt(); int fl = data.readInt(); boolean result = removeTask(taskId, fl); reply.writeNoException(); reply.writeInt(result ? 1 : 0); return true; }

Solution content

            return true;
        }

        case SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            String pkg = data.readString();
            boolean enabled = data.readInt() != 0;
            setPackageScreenCompatMode(pkg, enabled);
            reply.writeNoException();
            return true;
        }
        
        case SWITCH_USER_TRANSACTION: {
            data.enforceInterface(IActivityManager.descriptor);
            int userid = data.readInt();
            boolean result = switchUser(userid);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
            return true;
        }
        
        case REMOVE_SUB_TASK_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            int taskId = data.readInt();
            int subTaskIndex = data.readInt();
            boolean result = removeSubTask(taskId, subTaskIndex);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
            return true;
        }

        case REMOVE_TASK_TRANSACTION:
        {
            data.enforceInterface(IActivityManager.descriptor);
            int taskId = data.readInt();
            int fl = data.readInt();
            boolean result = removeTask(taskId, fl);
            reply.writeNoException();
            reply.writeInt(result ? 1 : 0);
            return true;
        }

File
ActivityManagerNative.java

Developer's decision
Manual

Kind of conflict
Case statement
Method invocation
Return statement
Variable

Chunk

Conflicting content
return result; } <<<<<<< HEAD public boolean switchUser(int userid) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(userid); mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(subTaskIndex); mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeTask(int taskId, int flags) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(flags); mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; ======= public void setPackageScreenCompatMode(String packageName, boolean compatEnabled) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); data.writeInt(compatEnabled ? 1 : 0); mRemote.transact(SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION, data, reply, 0); reply.readException(); reply.recycle(); data.recycle(); >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a } private IBinder mRemote;

Conflicting content

        return result;
    }

<<<<<<< HEAD
    public boolean switchUser(int userid) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(userid);
        mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(subTaskIndex);
        mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public boolean removeTask(int taskId, int flags) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(flags);
        mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
=======
    public void setPackageScreenCompatMode(String packageName, boolean compatEnabled)
            throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        data.writeInt(compatEnabled ? 1 : 0);
        mRemote.transact(SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION, data, reply, 0);
        reply.readException();
        reply.recycle();
        data.recycle();
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
    }

    private IBinder mRemote;

Solution content
return result; } public void setPackageScreenCompatMode(String packageName, boolean compatEnabled) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeString(packageName); data.writeInt(compatEnabled ? 1 : 0); mRemote.transact(SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION, data, reply, 0); reply.readException(); reply.recycle(); data.recycle(); } public boolean switchUser(int userid) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(userid); mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(subTaskIndex); mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } public boolean removeTask(int taskId, int flags) throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); data.writeInt(taskId); data.writeInt(flags); mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0); reply.readException(); boolean result = reply.readInt() != 0; reply.recycle(); data.recycle(); return result; } private IBinder mRemote;

Solution content

        return result;
    }

    public void setPackageScreenCompatMode(String packageName, boolean compatEnabled)
            throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeString(packageName);
        data.writeInt(compatEnabled ? 1 : 0);
        mRemote.transact(SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION, data, reply, 0);
        reply.readException();
        reply.recycle();
        data.recycle();
    }

    public boolean switchUser(int userid) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(userid);
        mRemote.transact(SWITCH_USER_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(subTaskIndex);
        mRemote.transact(REMOVE_SUB_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    public boolean removeTask(int taskId, int flags) throws RemoteException {
        Parcel data = Parcel.obtain();
        Parcel reply = Parcel.obtain();
        data.writeInterfaceToken(IActivityManager.descriptor);
        data.writeInt(taskId);
        data.writeInt(flags);
        mRemote.transact(REMOVE_TASK_TRANSACTION, data, reply, 0);
        reply.readException();
        boolean result = reply.readInt() != 0;
        reply.recycle();
        data.recycle();
        return result;
    }

    private IBinder mRemote;

File
ActivityManagerNative.java

Developer's decision
Concatenation

Kind of conflict
Method declaration
Method invocation
Method signature
Return statement
Variable

Chunk

Conflicting content
} } <<<<<<< HEAD private static final class DumpComponentInfo { ParcelFileDescriptor fd; ======= static final class DumpComponentInfo { FileDescriptor fd; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a IBinder token; String prefix; String[] args;

Conflicting content

        }
    }

<<<<<<< HEAD
    private static final class DumpComponentInfo {
        ParcelFileDescriptor fd;
=======
    static final class DumpComponentInfo {
        FileDescriptor fd;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
        IBinder token;
        String prefix;
        String[] args;

Solution content
} } static final class DumpComponentInfo { ParcelFileDescriptor fd; IBinder token; String prefix; String[] args;

File
ActivityThread.java

Developer's decision
Combination

Kind of conflict
Attribute
Class signature

Chunk

Conflicting content
} ParcelFileDescriptor fd; } <<<<<<< HEAD native private void dumpGraphicsInfo(FileDescriptor fd); ======= static final class UpdateCompatibilityData { String pkg; CompatibilityInfo info; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a private final class ApplicationThread extends ApplicationThreadNative { private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s";

Conflicting content

    }
        ParcelFileDescriptor fd;
    }

<<<<<<< HEAD
    native private void dumpGraphicsInfo(FileDescriptor fd);
=======
    static final class UpdateCompatibilityData {
        String pkg;
        CompatibilityInfo info;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a

    private final class ApplicationThread extends ApplicationThreadNative {
        private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s";

Solution content
ParcelFileDescriptor fd; } static final class UpdateCompatibilityData { String pkg; CompatibilityInfo info; } native private void dumpGraphicsInfo(FileDescriptor fd); private final class ApplicationThread extends ApplicationThreadNative { private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s";

Solution content

        ParcelFileDescriptor fd;
    }

    static final class UpdateCompatibilityData {
        String pkg;
        CompatibilityInfo info;
    }
    
    native private void dumpGraphicsInfo(FileDescriptor fd);

    private final class ApplicationThread extends ApplicationThreadNative {
        private static final String HEAP_COLUMN = "%17s %8s %8s %8s %8s";

File
ActivityThread.java

Developer's decision
Concatenation

Kind of conflict
Class declaration
Method interface

Chunk

Conflicting content
public int startActivitiesInPackage(int uid, Intent[] intents, String[] resolvedTypes, IBinder resultTo) throws RemoteException; <<<<<<< HEAD // Multi-user APIs public boolean switchUser(int userid) throws RemoteException; public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException; public boolean removeTask(int taskId, int flags) throws RemoteException; ======= public void setPackageScreenCompatMode(String packageName, boolean compatEnabled) throws RemoteException; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a /* * Private non-Binder interfaces

Conflicting content

    public int startActivitiesInPackage(int uid,
            Intent[] intents, String[] resolvedTypes, IBinder resultTo) throws RemoteException;

<<<<<<< HEAD
    // Multi-user APIs
    public boolean switchUser(int userid) throws RemoteException;
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException;

    public boolean removeTask(int taskId, int flags) throws RemoteException;
=======
    public void setPackageScreenCompatMode(String packageName, boolean compatEnabled)
            throws RemoteException;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a

    /*
     * Private non-Binder interfaces

Solution content
public int startActivitiesInPackage(int uid, Intent[] intents, String[] resolvedTypes, IBinder resultTo) throws RemoteException; public void setPackageScreenCompatMode(String packageName, boolean compatEnabled) throws RemoteException; // Multi-user APIs public boolean switchUser(int userid) throws RemoteException; public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException; public boolean removeTask(int taskId, int flags) throws RemoteException; /* * Private non-Binder interfaces

Solution content

    public int startActivitiesInPackage(int uid,
            Intent[] intents, String[] resolvedTypes, IBinder resultTo) throws RemoteException;

    public void setPackageScreenCompatMode(String packageName, boolean compatEnabled)
            throws RemoteException;
    
    // Multi-user APIs
    public boolean switchUser(int userid) throws RemoteException;
    
    public boolean removeSubTask(int taskId, int subTaskIndex) throws RemoteException;

    public boolean removeTask(int taskId, int flags) throws RemoteException;

    /*
     * Private non-Binder interfaces

File
IActivityManager.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method interface

Chunk

Conflicting content
int START_ACTIVITIES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+120; int START_ACTIVITIES_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+121; int ACTIVITY_SLEPT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+122; <<<<<<< HEAD int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123; int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124; int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125; ======= int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a }

Conflicting content

    int START_ACTIVITIES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+120;
    int START_ACTIVITIES_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+121;
    int ACTIVITY_SLEPT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+122;
<<<<<<< HEAD
    int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123;
    int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124;
    int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125;
=======
    int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
}

Solution content
int START_ACTIVITIES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+120; int START_ACTIVITIES_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+121; int ACTIVITY_SLEPT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+122; int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123; int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124; int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125; int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126; }

Solution content

    int START_ACTIVITIES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+120;
    int START_ACTIVITIES_IN_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+121;
    int ACTIVITY_SLEPT_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+122;
    int SET_PACKAGE_SCREEN_COMPAT_MODE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+123;
    int SWITCH_USER_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+124;
    int REMOVE_SUB_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+125;
    int REMOVE_TASK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+126;
}

File
IActivityManager.java

Developer's decision
Manual

Kind of conflict
Attribute

Chunk

Conflicting content
} public int hashCode() { <<<<<<< HEAD return ((int)this.fontScale) + this.mcc + this.mnc + (this.locale != null ? this.locale.hashCode() : 0) + this.touchscreen + this.keyboard + this.keyboardHidden + this.hardKeyboardHidden + this.navigation + this.navigationHidden + this.orientation + this.screenLayout + this.uiMode + this.screenWidthDp + this.screenHeightDp; ======= int result = 17; result = 31 * result + Float.floatToIntBits(fontScale); result = 31 * result + mcc; result = 31 * result + mnc; result = 31 * result + (locale != null ? locale.hashCode() : 0); result = 31 * result + touchscreen; result = 31 * result + keyboard; result = 31 * result + keyboardHidden; result = 31 * result + hardKeyboardHidden; result = 31 * result + navigation; result = 31 * result + navigationHidden; result = 31 * result + orientation; result = 31 * result + screenLayout; result = 31 * result + uiMode; return result; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a } }

Conflicting content

    }
    
    public int hashCode() {
<<<<<<< HEAD
        return ((int)this.fontScale) + this.mcc + this.mnc
                + (this.locale != null ? this.locale.hashCode() : 0)
                + this.touchscreen
                + this.keyboard + this.keyboardHidden + this.hardKeyboardHidden
                + this.navigation + this.navigationHidden
                + this.orientation + this.screenLayout + this.uiMode
                + this.screenWidthDp + this.screenHeightDp;
=======
        int result = 17;
        result = 31 * result + Float.floatToIntBits(fontScale);
        result = 31 * result + mcc;
        result = 31 * result + mnc;
        result = 31 * result + (locale != null ? locale.hashCode() : 0);
        result = 31 * result + touchscreen;
        result = 31 * result + keyboard;
        result = 31 * result + keyboardHidden;
        result = 31 * result + hardKeyboardHidden;
        result = 31 * result + navigation;
        result = 31 * result + navigationHidden;
        result = 31 * result + orientation;
        result = 31 * result + screenLayout;
        result = 31 * result + uiMode;
        return result;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
    }
}

Solution content
} public int hashCode() { int result = 17; result = 31 * result + Float.floatToIntBits(fontScale); result = 31 * result + mcc; result = 31 * result + mnc; result = 31 * result + (locale != null ? locale.hashCode() : 0); result = 31 * result + touchscreen; result = 31 * result + keyboard; result = 31 * result + keyboardHidden; result = 31 * result + hardKeyboardHidden; result = 31 * result + navigation; result = 31 * result + navigationHidden; result = 31 * result + orientation; result = 31 * result + screenLayout; result = 31 * result + uiMode; result = 31 * result + screenWidthDp; result = 31 * result + screenHeightDp; return result; } }

Solution content

    }
    
    public int hashCode() {
        int result = 17;
        result = 31 * result + Float.floatToIntBits(fontScale);
        result = 31 * result + mcc;
        result = 31 * result + mnc;
        result = 31 * result + (locale != null ? locale.hashCode() : 0);
        result = 31 * result + touchscreen;
        result = 31 * result + keyboard;
        result = 31 * result + keyboardHidden;
        result = 31 * result + hardKeyboardHidden;
        result = 31 * result + navigation;
        result = 31 * result + navigationHidden;
        result = 31 * result + orientation;
        result = 31 * result + screenLayout;
        result = 31 * result + uiMode;
        result = 31 * result + screenWidthDp;
        result = 31 * result + screenHeightDp;
        return result;
    }
}

File
Configuration.java

Developer's decision
Manual

Kind of conflict
Attribute
Cast expression
Method invocation
Return statement
Variable

Chunk

Conflicting content
} int configChanges = 0xfffffff; if (config != null) { <<<<<<< HEAD configChanges = mConfiguration.updateFrom(config); configChanges = ActivityInfo.activityInfoConfigToNative(configChanges); ======= mTmpConfig.setTo(config); mCompatibilityInfo.applyToConfiguration(mTmpConfig); configChanges = mConfiguration.updateFrom(mTmpConfig); >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a } if (mConfiguration.locale == null) { mConfiguration.locale = Locale.getDefault();

Conflicting content

            }
            int configChanges = 0xfffffff;
            if (config != null) {
<<<<<<< HEAD
                configChanges = mConfiguration.updateFrom(config);
                configChanges = ActivityInfo.activityInfoConfigToNative(configChanges);
=======
                mTmpConfig.setTo(config);
                mCompatibilityInfo.applyToConfiguration(mTmpConfig);
                configChanges = mConfiguration.updateFrom(mTmpConfig);
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
            }
            if (mConfiguration.locale == null) {
                mConfiguration.locale = Locale.getDefault();

Solution content
} int configChanges = 0xfffffff; if (config != null) { mTmpConfig.setTo(config); mCompatibilityInfo.applyToConfiguration(mTmpConfig); configChanges = mConfiguration.updateFrom(mTmpConfig); configChanges = ActivityInfo.activityInfoConfigToNative(configChanges); } if (mConfiguration.locale == null) { mConfiguration.locale = Locale.getDefault();

Solution content

            }
            int configChanges = 0xfffffff;
            if (config != null) {
                mTmpConfig.setTo(config);
                mCompatibilityInfo.applyToConfiguration(mTmpConfig);
                configChanges = mConfiguration.updateFrom(mTmpConfig);
                configChanges = ActivityInfo.activityInfoConfigToNative(configChanges);
            }
            if (mConfiguration.locale == null) {
                mConfiguration.locale = Locale.getDefault();

File
Resources.java

Developer's decision
Combination

Kind of conflict
Method invocation
Variable

Chunk

Conflicting content
import com.android.internal.view.BaseInputHandler; import com.android.internal.widget.PointerLocationView; <<<<<<< HEAD ======= import android.util.Config; >>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a import android.util.EventLog; import android.util.Log; import android.util.Slog;

Conflicting content

import com.android.internal.view.BaseInputHandler;
import com.android.internal.widget.PointerLocationView;

<<<<<<< HEAD
=======
import android.util.Config;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
import android.util.EventLog;
import android.util.Log;
import android.util.Slog;

Solution content
import com.android.internal.view.BaseInputHandler; import com.android.internal.widget.PointerLocationView; import android.util.EventLog; import android.util.Log; import android.util.Slog;

File
PhoneWindowManager.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content

        implements Watchdog.Monitor, BatteryStatsImpl.BatteryCallback {
    static final String TAG = "ActivityManager";
    static final boolean DEBUG = false;
<<<<<<< HEAD
    static final boolean localLOGV = false;
=======
    static final boolean localLOGV = DEBUG;
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
    static final boolean DEBUG_SWITCH = localLOGV || false;
    static final boolean DEBUG_TASKS = localLOGV || false;
    static final boolean DEBUG_PAUSE = localLOGV || false;

Solution content

        implements Watchdog.Monitor, BatteryStatsImpl.BatteryCallback {
    static final String TAG = "ActivityManager";
    static final boolean DEBUG = false;
    static final boolean localLOGV = DEBUG;
    static final boolean DEBUG_SWITCH = localLOGV || false;
    static final boolean DEBUG_TASKS = localLOGV || false;
    static final boolean DEBUG_PAUSE = localLOGV || false;

File
ActivityManagerService.java

Developer's decision
Version 2

Kind of conflict
Attribute

Chunk

Conflicting content

            pw.println("  mHeavyWeightProcess: " + mHeavyWeightProcess);
        }
        pw.println("  mConfiguration: " + mConfiguration);
<<<<<<< HEAD
        if (dumpAll) {
            pw.println("  mConfigWillChange: " + mMainStack.mConfigWillChange);
=======
        pw.println("  mConfigWillChange: " + mMainStack.mConfigWillChange);
        if (mScreenCompatPackages.size() > 0) {
            pw.print("  mScreenCompatPackages=");
            pw.println(mScreenCompatPackages);
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
        }
        pw.println("  mSleeping=" + mSleeping + " mShuttingDown=" + mShuttingDown);
        if (mDebugApp != null || mOrigDebugApp != null || mDebugTransient

Solution content

        }
            pw.println("  mHeavyWeightProcess: " + mHeavyWeightProcess);
        pw.println("  mConfiguration: " + mConfiguration);
        if (dumpAll) {
            pw.println("  mConfigWillChange: " + mMainStack.mConfigWillChange);
            if (mScreenCompatPackages.size() > 0) {
                pw.print("  mScreenCompatPackages=");
                pw.println(mScreenCompatPackages);
            }
        }
        pw.println("  mSleeping=" + mSleeping + " mShuttingDown=" + mShuttingDown);
        if (mDebugApp != null || mOrigDebugApp != null || mDebugTransient

File
ActivityManagerService.java

Developer's decision
Manual

Kind of conflict
If statement
Method invocation

Chunk

Conflicting content

                pw.print(" immersive="); pw.print(immersive);
                pw.print(" launchMode="); pw.println(launchMode);
        pw.print(prefix); pw.print("frozenBeforeDestroy="); pw.print(frozenBeforeDestroy);
<<<<<<< HEAD
                pw.print(" thumbnailNeeded="); pw.println(thumbnailNeeded);
        pw.print(prefix); pw.print("thumbHolder="); pw.println(thumbHolder);
=======
                pw.print(" thumbnailNeeded="); pw.print(thumbnailNeeded);
                pw.print(" forceNewConfig="); pw.println(forceNewConfig);
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a
        if (launchTime != 0 || startTime != 0) {
            pw.print(prefix); pw.print("launchTime=");
                    TimeUtils.formatDuration(launchTime, pw); pw.print(" startTime=");

Solution content

                pw.print(" immersive="); pw.print(immersive);
                pw.print(" launchMode="); pw.println(launchMode);
        pw.print(prefix); pw.print("frozenBeforeDestroy="); pw.print(frozenBeforeDestroy);
                pw.print(" thumbnailNeeded="); pw.print(thumbnailNeeded);
                pw.print(" forceNewConfig="); pw.println(forceNewConfig);
        pw.print(prefix); pw.print("thumbHolder="); pw.println(thumbHolder);
        if (launchTime != 0 || startTime != 0) {
            pw.print(prefix); pw.print("launchTime=");
                    TimeUtils.formatDuration(launchTime, pw); pw.print(" startTime=");

File
ActivityRecord.java

Developer's decision
Combination

Kind of conflict
Attribute
Method invocation

Chunk

Conflicting content

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

<<<<<<< HEAD
            dw = mCurDisplayWidth;
            dh = mCurDisplayHeight;
=======
            dw = mPolicy.getNonDecorDisplayWidth(mDisplay.getWidth());
            dh = mPolicy.getNonDecorDisplayHeight(mDisplay.getHeight());
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a

            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
Manual

Kind of conflict
Attribute
Method invocation
Variable

Chunk

Conflicting content

        config.orientation = orientation;

        DisplayMetrics dm = new DisplayMetrics();
<<<<<<< HEAD
        mDisplay.getRealMetrics(dm);

        // Override display width and height with what we are computing,
        // to be sure they remain consistent.
        dm.widthPixels = dw;
        dm.heightPixels = dh;

        CompatibilityInfo.updateCompatibleScreenFrame(dm, orientation, mCompatibleScreenFrame);
=======
        mDisplay.getMetrics(dm);
        dm.realWidthPixels = mPolicy.getNonDecorDisplayWidth(dm.realWidthPixels);
        dm.realHeightPixels = mPolicy.getNonDecorDisplayHeight(dm.realHeightPixels);
        mCompatibleScreenScale = CompatibilityInfo.updateCompatibleScreenFrame(
                dm, mCompatibleScreenFrame, null);
>>>>>>> 05be6d6fe09ddfb706d1bef3b20c3d37f45e3c8a

        config.screenWidthDp = (int)(dm.widthPixels / dm.density);
        config.screenHeightDp = (int)(dm.heightPixels / dm.density);

Solution content

        config.orientation = orientation;

        DisplayMetrics dm = new DisplayMetrics();
        mDisplay.getRealMetrics(dm);

        // Override display width and height with what we are computing,
        // to be sure they remain consistent.
        dm.widthPixels = mPolicy.getNonDecorDisplayWidth(dw);
        dm.heightPixels = mPolicy.getNonDecorDisplayHeight(dh);

        mCompatibleScreenScale = CompatibilityInfo.updateCompatibleScreenFrame(
                dm, mCompatibleScreenFrame, null);

        config.screenWidthDp = (int)(dm.widthPixels / dm.density);
        config.screenHeightDp = (int)(dm.heightPixels / dm.density);

File
WindowManagerService.java

Developer's decision
Manual

Kind of conflict
Attribute
Comment
Method invocation
Variable

Projects >> frameworks_base_disabled >>aa9d84c37e05f696ec158dac98ce38cf41e18314