Merge "Don't require apps to call showLights to use default lights." (a37278b0) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+4 −3

Original line number	Original line	Diff line number	Diff line
	@@ -2623,9 +2623,6 @@ public class Notification implements Parcelable
	if (onMs != 0 \|\| offMs != 0) {		if (onMs != 0 \|\| offMs != 0) {
	mN.flags \|= FLAG_SHOW_LIGHTS;		mN.flags \|= FLAG_SHOW_LIGHTS;
	}		}
	if ((mN.defaults & DEFAULT_LIGHTS) != 0) {
	mN.flags \|= FLAG_SHOW_LIGHTS;
	}
	return this;		return this;
	}		}

	@@ -3603,6 +3600,10 @@ public class Notification implements Parcelable
	mStyle.buildStyled(mN);		mStyle.buildStyled(mN);
	}		}

			if ((mN.defaults & DEFAULT_LIGHTS) != 0) {
			mN.flags \|= FLAG_SHOW_LIGHTS;
			}

	return mN;		return mN;
	}		}