Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7dcde10d authored by Robert Greenwalt's avatar Robert Greenwalt Committed by android-build-merger
Browse files

Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am:... 

Merge "Fix MSIM issue of broadcast intent overwritten unintentionally" am: 22cef050 am: dd6d6cfe am: cf23ddf5
am: 9896f991

Change-Id: I60c29c8f3f1bd3546985c0a453d53f25c6e0ed0b
parents 7fb38fb1 9896f991

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+0 −1
Original line number Diff line number Diff line
@@ -3149,7 +3149,6 @@ public class GsmCdmaPhone extends Phone { 


        // Send an Intent to the PhoneApp that we had a radio technology change

        Intent intent = new Intent(TelephonyIntents.ACTION_RADIO_TECHNOLOGY_CHANGED);

        intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

        intent.putExtra(PhoneConstants.PHONE_NAME_KEY, getPhoneName());

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, mPhoneId);

        ActivityManager.broadcastStickyIntent(intent, UserHandle.USER_ALL);

src/java/com/android/internal/telephony/ServiceStateTracker.java

+0 −2
Original line number Diff line number Diff line
@@ -2234,7 +2234,6 @@ public class ServiceStateTracker extends Handler { 
                            "subId='%d'", showPlmn, plmn, showSpn, spn, dataSpn, subId));

                }

                Intent intent = new Intent(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

                intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

                intent.putExtra(TelephonyIntents.EXTRA_SHOW_SPN, showSpn);

                intent.putExtra(TelephonyIntents.EXTRA_SPN, spn);

                intent.putExtra(TelephonyIntents.EXTRA_DATA_SPN, dataSpn);
@@ -2292,7 +2291,6 @@ public class ServiceStateTracker extends Handler { 
                            " showPlmn='%b' plmn='%s' subId='%d'", showPlmn, plmn, subId));

                }

                Intent intent = new Intent(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION);

                intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING);

                intent.putExtra(TelephonyIntents.EXTRA_SHOW_SPN, false);

                intent.putExtra(TelephonyIntents.EXTRA_SPN, "");

                intent.putExtra(TelephonyIntents.EXTRA_SHOW_PLMN, showPlmn);

tests/telephonytests/src/com/android/internal/telephony/ServiceStateTrackerTest.java

+0 −1
Original line number Diff line number Diff line
@@ -247,7 +247,6 @@ public class ServiceStateTrackerTest extends TelephonyTest { 
        // We only want to verify the intent SPN_STRINGS_UPDATED_ACTION.

        Intent intent = intentArgumentCaptor.getValue();

        assertEquals(TelephonyIntents.SPN_STRINGS_UPDATED_ACTION, intent.getAction());

        assertEquals(Intent.FLAG_RECEIVER_REPLACE_PENDING, intent.getFlags());



        Bundle b = intent.getExtras();