| Chunk |
|---|
| Conflicting content |
|---|
notification = new Notification(
<<<<<<< HEAD
mContext, // context
R.drawable.stat_sys_phone_call_forward, // icon
=======
android.R.drawable.stat_sys_phone_call_forward, // icon
>>>>>>> 47abf25faf4e513394f6f10dac03562913be04c1
null, // tickerText
0); // The "timestamp" of this notification is meaningless;
// we only care about whether CFI is currently on or not. |
| Solution content |
|---|
notification = new Notification(
R.drawable.stat_sys_phone_call_forward, // icon
null, // tickerText
0); // The "timestamp" of this notification is meaningless;
// we only care about whether CFI is currently on or not. |
| File |
|---|
| NotificationMgr.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Attribute |
| Comment |