From 61ccc162a08adf29dde65d3099ef1278996a2440 Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sat, 13 Oct 2012 17:03:16 -0700
Subject: [PATCH] Fix edge case with status message (issue 7343848)

-> When an unimportant message is set, we need to clear the security string
   so that battery / owner info takes precedence at that point.

Change-Id: I3f86b0c2cc8fb2fb0023fce77a7725d8ada96d9e
---
 .../impl/keyguard/KeyguardStatusViewManager.java    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
index ab5e39463d727..9615e7134381b 100644
--- a/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
+++ b/policy/src/com/android/internal/policy/impl/keyguard/KeyguardStatusViewManager.java
@@ -189,14 +189,16 @@ class KeyguardStatusViewManager implements SecurityMessageDisplay {
     }
 
     public void setMessage(CharSequence msg, boolean important) {
-        if (!important) return;
-        mSecurityMessageContents = msg;
+        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 = "";