From 48343c3470dc32e6a13786458bd69dd0254aac08 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Thu, 7 Feb 2019 10:28:50 -0500
Subject: [PATCH] Fixes NPE in CarrierTextController

The bug was observable when the device had security (PIN, etc.).

Test: Manual. Installed ThemePicker and changed themes.
Change-Id: I7a086137f0acfad82cee312ac0521ca15738858b
Fixes: 124013078
---
 .../src/com/android/keyguard/CarrierTextController.java      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
index d5bd2b2028036..1539582ef18b6 100644
--- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
+++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
@@ -299,8 +299,9 @@ public class CarrierTextController {
                 displayText.toString().split(mSeparator.toString()),
                 anySimReadyAndInService && !missingSimsWithSubs,
                 subsIds);
-        if (mCarrierTextCallback != null) {
-            handler.post(() -> mCarrierTextCallback.updateCarrierInfo(info));
+        final CarrierTextCallback callback = mCarrierTextCallback;
+        if (callback != null) {
+            handler.post(() -> callback.updateCarrierInfo(info));
         }
 
     }