Merge "Fix 5117544: Fix crash in KeyguardStatusViewManager when resId==0" (adff7fa2) · Commits · e / os / android_frameworks_base

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

+6 −2

Original line number	Diff line number	Diff line
		@@ -232,10 +232,14 @@ class KeyguardStatusViewManager implements OnClickListener {
		* @param resId resource id of the message
		*/
		public void setCarrierHelpText(int resId) {
		mCarrierHelpText = getContext().getText(resId);
		mCarrierHelpText = getText(resId);
		update(CARRIER_HELP_TEXT, mCarrierHelpText);
		}

		private CharSequence getText(int resId) {
		return resId == 0 ? null : getContext().getText(resId);
		}

		/**
		* Unlock help message. This is typically for help with unlock widgets, e.g. "wrong password"
		* or "try again."
		@@ -244,7 +248,7 @@ class KeyguardStatusViewManager implements OnClickListener {
		* @param lockIcon
		*/
		public void setHelpMessage(int textResId, int lockIcon) {
		mHelpMessageText = getContext().getString(textResId);
		mHelpMessageText = getText(textResId).toString();
		update(HELP_MESSAGE_TEXT, mHelpMessageText);
		}