commit e1571aeb8dd9976a21f7680a55f09abc6693ed1f
author Sangyun Yun <sangyun@google.com> Fri Dec 15 05:36:04 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Dec 15 05:36:04 2023 +0000
tree b8c90798a4d41c9c2f1ae8d34178c35907a240f9
parent cc0293e9dabae83b6c270c9a5fa4cc189b741528
parent 19f8a1ee34b2a0f57ba83c32bd6f06eb3b36416f

Merge "Load default data subid on create" into udc-qpr-dev am: 19f8a1ee34

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telephony/+/25616753

Change-Id: I1f9315df53c2f4616e72674423c99198c093d135
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/phone/PhoneGlobals.java

diff --git a/src/com/android/phone/PhoneGlobals.java b/src/com/android/phone/PhoneGlobals.java
index 69fc8ef..fbad8e9 100644
--- a/src/com/android/phone/PhoneGlobals.java
+++ b/src/com/android/phone/PhoneGlobals.java
@@ -577,6 +577,13 @@
             intentFilter.addAction(TelephonyIntents.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED);
             intentFilter.addAction(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
             registerReceiver(mReceiver, intentFilter);
+            int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
+            if (SubscriptionManager.isValidSubscriptionId(defaultDataSubId)) {
+                if (VDBG) Log.v(LOG_TAG, "Loaded initial default data sub: " + defaultDataSubId);
+                mDefaultDataSubId = defaultDataSubId;
+                registerSettingsObserver();
+                updateDataRoamingStatus();
+            }
 
             PhoneConfigurationManager.registerForMultiSimConfigChange(
                     mHandler, EVENT_MULTI_SIM_CONFIG_CHANGED, null);