Merge "Fix edge case with status message (issue 7343848)" into jb-mr1-dev (33387b1b) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java

+7 −6

Original line number	Diff line number	Diff line
		@@ -189,14 +189,16 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay {
		}

		public void setMessage(CharSequence msg, boolean important) {
		if (!important) return;
		if (!important) {
		mSecurityMessageContents = "";
		} else {
		mSecurityMessageContents = msg;
		}
		securityMessageChanged();
		}

		public void setMessage(int resId, boolean important) {
		if (!important) return;
		if (resId != 0) {
		if (resId != 0 && important) {
		mSecurityMessageContents = getContext().getResources().getText(resId);
		} else {
		mSecurityMessageContents = "";
		@@ -205,8 +207,7 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay {
		}

		public void setMessage(int resId, boolean important, Object... formatArgs) {
		if (!important) return;
		if (resId != 0) {
		if (resId != 0 && important) {
		mSecurityMessageContents = getContext().getString(resId, formatArgs);
		} else {
		mSecurityMessageContents = "";