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

Commit 22cef050 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Gerrit Code Review
Browse files

Merge "Fix MSIM issue of broadcast intent overwritten unintentionally"

parents 3ae7236b 0769aad7

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

+0 −1
Original line number Diff line number Diff line
@@ -3066,7 +3066,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);

        ActivityManagerNative.broadcastStickyIntent(intent, null, UserHandle.USER_ALL);

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

+0 −2
Original line number Diff line number Diff line
@@ -2196,7 +2196,6 @@ public class ServiceStateTracker extends Handler { 
                            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);
@@ -2240,7 +2239,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
@@ -208,7 +208,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();