Merge "Fixes NPE in CarrierTextController"

2019-02-08 19:04:07 +00:00
parent 730c407595 48343c3470
commit 6ad5f0d3ed
1 changed files with 3 additions and 2 deletions
--- 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));
        }

    }