| Chunk |
|---|
| Conflicting content |
|---|
@Override
public void bindView(View view, Context context, Cursor cursor) {
CheckedTextView text = (CheckedTextView) view.findViewById(R.id.text1);
<<<<<<< HEAD
text.setText(cursor.getString(cursor.getColumnIndexOrThrow(mLabelColumn)));
if (cursor.getInt(cursor.getColumnIndexOrThrow(mIsCheckedColumn)) == 1) {
listView.setItemChecked(cursor.getPosition(), true);
}
}
@Override
public View newView(Context context, Cursor cursor,
ViewGroup parent) {
View view = mInflater.inflate(
R.layout.select_dialog_multichoice, parent, false);
bindView(view, context, cursor);
return view;
=======
text.setText(cursor.getString(mLabelIndex));
listView.setItemChecked(cursor.getPosition(),
cursor.getInt(mIsCheckedIndex) == 1);
}
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return mInflater.inflate(R.layout.select_dialog_multichoice,
parent, false);
>>>>>>> f013e1afd1e68af5e3b868c26a653bbfb39538f8
}
}; |
| Solution content |
|---|
@Override
public void bindView(View view, Context context, Cursor cursor) {
CheckedTextView text = (CheckedTextView) view.findViewById(R.id.text1);
text.setText(cursor.getString(mLabelIndex));
listView.setItemChecked(cursor.getPosition(),
cursor.getInt(mIsCheckedIndex) == 1);
}
@Override
public View newView(Context context, Cursor cursor, ViewGroup parent) {
return mInflater.inflate(R.layout.select_dialog_multichoice,
parent, false);
}
}; |
| File |
|---|
| AlertController.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Annotation |
| If statement |
| Method invocation |
| Method signature |
| Return statement |
| Variable |
| Chunk |
|---|
| Conflicting content |
|---|
@Deprecated public static final int ROUTE_BLUETOOTH = (1 << 2);
public static final int ROUTE_BLUETOOTH_SCO = (1 << 2);
public static final int ROUTE_HEADSET = (1 << 3);
<<<<<<< HEAD
public static final int ROUTE_ALL = 0xFFFFFFFF;
=======
public static final int ROUTE_BLUETOOTH_A2DP = (1 << 4);
public static final int ROUTE_ALL = 0xFFFFFFFF;
>>>>>>> f013e1afd1e68af5e3b868c26a653bbfb39538f8
/*
* Sets the audio routing for a specified mode |
| Solution content |
|---|
@Deprecated public static final int ROUTE_BLUETOOTH = (1 << 2);
public static final int ROUTE_BLUETOOTH_SCO = (1 << 2);
public static final int ROUTE_HEADSET = (1 << 3);
public static final int ROUTE_BLUETOOTH_A2DP = (1 << 4);
public static final int ROUTE_ALL = 0xFFFFFFFF;
/*
* Sets the audio routing for a specified mode |
| File |
|---|
| AudioSystem.java |
| Developer's decision |
|---|
| Version 2 |
| Kind of conflict |
|---|
| Attribute |
| Chunk |
|---|
| Conflicting content |
|---|
if (mGpsLocationProvider == null) {
return false;
}
<<<<<<< HEAD
if (mContext.checkCallingPermission(ACCESS_FINE_LOCATION) !=
PackageManager.PERMISSION_GRANTED) {
=======
if (mContext.checkCallingPermission(ACCESS_FINE_LOCATION) !=
PackageManager.PERMISSION_GRANTED) {
>>>>>>> f013e1afd1e68af5e3b868c26a653bbfb39538f8
throw new SecurityException("Requires ACCESS_FINE_LOCATION permission");
}
|
| Solution content |
|---|
if (mGpsLocationProvider == null) {
return false;
}
if (mContext.checkCallingPermission(ACCESS_FINE_LOCATION) !=
PackageManager.PERMISSION_GRANTED) {
throw new SecurityException("Requires ACCESS_FINE_LOCATION permission");
}
|
| File |
|---|
| LocationManagerService.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |