commit f220d95f543d76878aed3f7efb199a5e1c0d9e5a
author Jorim Jaggi <jjaggi@google.com> Wed May 31 18:07:21 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 31 18:07:26 2017 +0000
tree a3d6e985f345a98b97145283a668dd11f237fb5e
parent db0836779ea7bb36088ebe77de14461b2a0cc033
parent ad15b4982c8be1f4ae5269134c75fb4de2d53903

Merge "Check for null owner info" into oc-dev

packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
index f0ff22d..db1e8a9 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
@@ -147,8 +147,10 @@
         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() {