| Chunk |
|---|
| Conflicting content |
|---|
NotificationManager mNotificationMgr = (NotificationManager) this
.getSystemService(Context.NOTIFICATION_SERVICE);
if (count == 0) {
<<<<<<< HEAD
this.setForeground(false);
=======
// set background
try {
new HelperAPI5().stopForeground(this, true);
} catch (VerifyError e) {
Log.d(TAG, "no api5 running");
}
>>>>>>> 534d09e79f7e69ba006d50495a6da9d46c5bfc20
mNotificationMgr.cancel(NOTIFICATION_PENDING);
} else {
// set foreground, don't let kill while IO |
| Solution content |
|---|
NotificationManager mNotificationMgr = (NotificationManager) this
.getSystemService(Context.NOTIFICATION_SERVICE);
if (count == 0) {
this.setForeground(false);
// set background
try {
new HelperAPI5().stopForeground(this, true);
} catch (VerifyError e) {
Log.d(TAG, "no api5 running");
}
mNotificationMgr.cancel(NOTIFICATION_PENDING);
} else {
// set foreground, don't let kill while IO |
| File |
|---|
| IOService.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Comment |
| Method invocation |
| Try statement |
| Chunk |
|---|
| Conflicting content |
|---|
.getString(R.string.notify_sending), "", contentIntent);
notification.defaults |= Notification.FLAG_NO_CLEAR;
mNotificationMgr.notify(NOTIFICATION_PENDING, notification);
<<<<<<< HEAD
this.setForeground(true);
=======
try {
new HelperAPI5().startForeground(this, NOTIFICATION_PENDING,
notification);
} catch (VerifyError e) {
Log.d(TAG, "no api5 running");
}
>>>>>>> 534d09e79f7e69ba006d50495a6da9d46c5bfc20
}
Log.d(TAG, "displayNotification(" + count + ") return");
} |
| Solution content |
|---|
.getString(R.string.notify_sending), "", contentIntent);
notification.defaults |= Notification.FLAG_NO_CLEAR;
mNotificationMgr.notify(NOTIFICATION_PENDING, notification);
this.setForeground(true);
try {
new HelperAPI5().startForeground(this, NOTIFICATION_PENDING,
notification);
} catch (VerifyError e) {
Log.d(TAG, "no api5 running");
}
}
Log.d(TAG, "displayNotification(" + count + ") return");
} |
| File |
|---|
| IOService.java |
| Developer's decision |
|---|
| Concatenation |
| Kind of conflict |
|---|
| Method invocation |
| Try statement |