commit f53e12be9254b389123a68690417b674f7131409
author Lei Liu <lei.xe.liu@sonymobile.com> Wed Jun 24 20:12:55 2020 +0800
committer Amit Mahajan <amitmahajan@google.com> Wed Sep 09 13:53:52 2020 -0700
tree 45d996c0eb9a474817890ede5e845283daa01d13
parent 422c621f95128fd5c79d041e7b11737b86312b64

Fix that voicemail number displayed as unknown after reboot device

Refresh the message waiting (voicemail) indicator after carrier config
loaded.

Bug: 161768263
Test: manual
Merged-in: I23d8eb4f6233feaf49b1e880feb212b9bb5b7c3b
Change-Id: I23d8eb4f6233feaf49b1e880feb212b9bb5b7c3b
(cherry picked from commit 863eac015b24221f08d2a7be1685ed8b489e40b5)

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 8f987b7..be1872f 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -120,6 +120,7 @@
     private static final int EVENT_RESTART_SIP = 14;
     private static final int EVENT_DATA_ROAMING_SETTINGS_CHANGED = 15;
     private static final int EVENT_MOBILE_DATA_SETTINGS_CHANGED = 16;
+    private static final int EVENT_CARRIER_CONFIG_CHANGED = 17;
 
     // The MMI codes are also used by the InCallScreen.
     public static final int MMI_INITIATE = 51;
@@ -303,6 +304,12 @@
                 case EVENT_MOBILE_DATA_SETTINGS_CHANGED:
                     updateDataRoamingStatus();
                     break;
+                case EVENT_CARRIER_CONFIG_CHANGED:
+                    int subId = (Integer) msg.obj;
+                    // The voicemail number could be overridden by carrier config, so need to
+                    // refresh the message waiting (voicemail) indicator.
+                    refreshMwiIndicator(subId);
+                    break;
             }
         }
     };
@@ -708,6 +715,12 @@
                 if (VDBG) Log.v(LOG_TAG, "carrier config changed.");
                 updateDataRoamingStatus();
                 updateLimitedSimFunctionForDualSim();
+                int subId = intent.getIntExtra(SubscriptionManager.EXTRA_SUBSCRIPTION_INDEX,
+                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                if (SubscriptionManager.isValidSubscriptionId(subId)) {
+                    mHandler.sendMessage(mHandler.obtainMessage(EVENT_CARRIER_CONFIG_CHANGED,
+                            new Integer(subId)));
+                }
             } else if (action.equals(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)) {
                 // We also need to pay attention when default data subscription changes.
                 if (VDBG) Log.v(LOG_TAG, "default data sub changed.");