commit 29b532ca878a8f322018e109e44b56da6f48eb51
author arunvoddu <arunvoddu@google.com> Wed Mar 26 03:39:04 2025 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Fri Mar 28 18:55:18 2025 -0700
tree e67a610f02f037c949b4c44280f1592e13e051a8
parent 84be111a3fe2a77acec5b4f29d0d1eabf5946afb

[Satellite]Not required to update with current PLMN when satellite data mocked.

Current PLMN will be added to satellite PLMN only when mock satellite time, but it is not
required to add the current PLMN or update the existing PLMN in mock satellite data.

Update the Default_servicves_int_array with data type is enough.

Bug: 402156202
Flag: EXEMPT bug fix
Test: Verified manually
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7a1a8f263975586b5a657b734c5e3537249c208)
Merged-In: I893754cebebc3f540e4514a21b488d598e6b6f49
Change-Id: I893754cebebc3f540e4514a21b488d598e6b6f49

src/com/android/phone/settings/RadioInfo.java

diff --git a/src/com/android/phone/settings/RadioInfo.java b/src/com/android/phone/settings/RadioInfo.java
index 1510217..65de1bc 100644
--- a/src/com/android/phone/settings/RadioInfo.java
+++ b/src/com/android/phone/settings/RadioInfo.java
@@ -2180,12 +2180,6 @@
      * @param bundleToModify : PersistableBundle
      */
     private void updateCarrierConfigToSupportData(PersistableBundle bundleToModify) {
-        // KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE key info update
-        PersistableBundle originalBundle = mSatelliteDataOriginalBundle[mPhoneId];
-        bundleToModify.putPersistableBundle(
-                KEY_CARRIER_SUPPORTED_SATELLITE_SERVICES_PER_PROVIDER_BUNDLE,
-                getSatelliteServicesBundleForOperatorPlmn(originalBundle));
-
         // KEY_CARRIER_ROAMING_SATELLITE_DEFAULT_SERVICES_INT_ARRAY key info update
         int[] availableServices = bundleToModify.getIntArray(
                 KEY_CARRIER_ROAMING_SATELLITE_DEFAULT_SERVICES_INT_ARRAY);
@@ -2305,11 +2299,12 @@
     }
 
     private void reloadCarrierConfigDefaults() {
-        if (mSatelliteDataOriginalBundle[mPhoneId] != null && isValidSubscription(mSubId)) {
+        if (mSatelliteDataOriginalBundle[mPhoneId] != null) {
             log("satData: Setting originalCarrierConfig = "
                     + mSatelliteDataOriginalBundle[mPhoneId]);
             getCarrierConfig().overrideConfig(mSubId, mSatelliteDataOriginalBundle[mPhoneId],
                     false);
+            mSatelliteDataOriginalBundle[mPhoneId] = null;
         }
     }