| Chunk |
|---|
| Conflicting content |
|---|
<<<<<<< HEAD
mLedNotification = mLights.get(n-1);
}
}
if (mLedNotification == null) {
mNotificationLight.turnOff();
=======
// we only flash if screen is off and persistent pulsing is enabled
if (mLedNotification == null || mScreenOn || !mNotificationPulseEnabled) {
mHardware.setLightOff_UNCHECKED(HardwareService.LIGHT_ID_NOTIFICATIONS);
>>>>>>> 9b7dba936c24fa7959561ddf1a0c8ba4d2165782
} else {
mNotificationLight.setFlashing(
mLedNotification.notification.ledARGB, |
| Solution content |
|---|
mLedNotification = mLights.get(n-1);
}
}
// we only flash if screen is off and persistent pulsing is enabled
if (mLedNotification == null || mScreenOn || !mNotificationPulseEnabled) {
mNotificationLight.turnOff();
} else {
mNotificationLight.setFlashing(
mLedNotification.notification.ledARGB, |
| File |
|---|
| NotificationManagerService.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Comment |
| If statement |
| Method invocation |