lineage-sdk lights: Treat requested led color of 0 as needing a default

*) fw/b now sets the color to 0 to indicate that we need to set
   a default (to cover Oreo+ sdk where DEFAULT_LIGHTS has been
   deprecated).

Change-Id: I91b7cfff2ea6f8c1b999b6246c14416a2a47cbfb
This commit is contained in:
Sam Mortimer
2018-02-10 22:45:54 -08:00
parent 9a097830fa
commit b37c96df9c

View File

@@ -238,7 +238,6 @@ public final class LineageNotificationLights {
boolean screenActive, int suppressedEffects) {
final boolean forcedOn = isForcedOn(n);
final int forcedBrightness = getForcedBrightness(n);
final boolean isDefaultLights = (n.defaults & Notification.DEFAULT_LIGHTS) != 0;
final boolean suppressScreenOff =
(suppressedEffects & SUPPRESSED_EFFECT_SCREEN_OFF) != 0;
final boolean suppressScreenOn =
@@ -253,7 +252,6 @@ public final class LineageNotificationLights {
+ " suppressedEffects=" + suppressedEffects
+ " forcedOn=" + forcedOn
+ " forcedBrightness=" + forcedBrightness
+ " isDefaultLights=" + isDefaultLights
+ " suppressScreenOff=" + suppressScreenOff
+ " suppressScreenOn=" + suppressScreenOn
+ " mCanAdjustBrightness=" + mCanAdjustBrightness
@@ -313,7 +311,7 @@ public final class LineageNotificationLights {
ledValuesPkg.getOnMs() : mDefaultNotificationLedOn);
ledValues.setOffMs(ledValuesPkg.getOffMs() >= 0 ?
ledValuesPkg.getOffMs() : mDefaultNotificationLedOff);
} else if (isDefaultLights) {
} else if (ledValues.getColor() == 0) {
ledValues.setColor(generateLedColorForPackageName(packageName));
ledValues.setOnMs(mDefaultNotificationLedOn);
ledValues.setOffMs(mDefaultNotificationLedOff);