commit 691c27459655c8a1e2bd868fddae9d6a5035a3bc
author Brad Stenning <stenning@google.com> Fri Apr 19 11:48:00 2019 -0700
committer Brad Stenning <stenning@google.com> Fri Apr 19 11:53:40 2019 -0700
tree 7217b921986936a99d8d95601509b82faa527d4b
parent 8fb611c6adf6ee57ce74f7826e914f146a85cf27

Fix NPE for devices that don't use a lock icon in sysui.

Bug: 130880522
Test: Manual
Change-Id: I9daa0eedd73df963069077976fbb3af008c4070d

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 7d4cf75..6101593 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -134,7 +134,10 @@
                 mTextView.getTextColors() : ColorStateList.valueOf(Color.WHITE);
         mDisclosure = indicationArea.findViewById(R.id.keyguard_indication_enterprise_disclosure);
         mLockIcon = lockIcon;
-        mLockIcon.setOnLongClickListener(this::handleTrustCircleClick);
+        // lock icon is not used on all form factors.
+        if (mLockIcon != null) {
+            mLockIcon.setOnLongClickListener(this::handleTrustCircleClick);
+        }
         mWakeLock = new SettableWakeLock(wakeLock, TAG);
         mLockPatternUtils = lockPatternUtils;