From 8fcd8b4f8a97b4aed8b900a0817ebc5dfb72d910 Mon Sep 17 00:00:00 2001
From: Brad Stenning <stenning@google.com>
Date: Mon, 22 Apr 2019 09:30:20 -0700
Subject: [PATCH] Fix NPE for devices that don't use a lock icon on the
 bouncer.

Bug: 130880522
Bug: 131083319
Test: Manual
Change-Id: I630f4df96b64a85d3b45fb95b28ed8e33b38ca1c
---
 .../systemui/statusbar/KeyguardIndicationController.java       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 6101593451108..ebafb8182ee3b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -693,6 +693,9 @@ public class KeyguardIndicationController implements StateListener {
 
         @Override
         public void onKeyguardBouncerChanged(boolean bouncer) {
+            if (mLockIcon == null) {
+                return;
+            }
             mLockIcon.setBouncerVisible(bouncer);
         }
     };