From ad15b4982c8be1f4ae5269134c75fb4de2d53903 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 30 May 2017 18:01:49 -0700 Subject: [PATCH] Check for null owner info Test: Cast screen, lock keyguard Change-Id: I314244d8a5fe1d7f49afbaf5247e84d5ea4df027 Fixes: 38484035 --- .../src/com/android/keyguard/KeyguardStatusView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java index f0ff22dc45c7f..db1e8a9c112ef 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java @@ -147,8 +147,10 @@ public class KeyguardStatusView extends GridLayout { mClockView.setLayoutParams(layoutParams); mDateView.setTextSize(TypedValue.COMPLEX_UNIT_PX, getResources().getDimensionPixelSize(R.dimen.widget_label_font_size)); - mOwnerInfo.setTextSize(TypedValue.COMPLEX_UNIT_PX, - getResources().getDimensionPixelSize(R.dimen.widget_label_font_size)); + if (mOwnerInfo != null) { + mOwnerInfo.setTextSize(TypedValue.COMPLEX_UNIT_PX, + getResources().getDimensionPixelSize(R.dimen.widget_label_font_size)); + } } public void refreshTime() {