Merge QP1A.190509.001

Change-Id: I97bb3901e50d34a7fbe3c85480379d173ef5c0be

1 files changed, 5 insertions, 4 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
index 0228f2f8fe49..bcfab519c1ae 100644
--- a/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
+++ b/packages/SystemUI/src/com/android/keyguard/CarrierTextController.java
@@ -177,6 +177,9 @@ public class CarrierTextController {
         mSimSlotsNumber = ((TelephonyManager) context.getSystemService(
                 Context.TELEPHONY_SERVICE)).getPhoneCount();
         mSimErrorState = new boolean[mSimSlotsNumber];
+        updateDisplayOpportunisticSubscriptionCarrierText(SystemProperties.getBoolean(
+                TelephonyProperties.DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME,
+                false));
     }
 
     /**
@@ -285,10 +288,8 @@ public class CarrierTextController {
      *
      */
     @VisibleForTesting
-    public void updateDisplayOpportunisticSubscriptionCarrierText() {
-        mDisplayOpportunisticSubscriptionCarrierText = SystemProperties
-            .getBoolean(TelephonyProperties
-                .DISPLAY_OPPORTUNISTIC_SUBSCRIPTION_CARRIER_TEXT_PROPERTY_NAME, false);
+    public void updateDisplayOpportunisticSubscriptionCarrierText(boolean isEnable) {
+        mDisplayOpportunisticSubscriptionCarrierText = isEnable;
     }
 
     protected List<SubscriptionInfo> getSubscriptionInfo() {