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

Commit dd6d6cfe 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: 22cef050

Change-Id: I491020287c868be0fa31434931420a1564f2d4a0
parents 92a744d3 22cef050

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

+0 −1
Original line number Diff line number Diff line
@@ -3087,7 +3087,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
@@ -2229,7 +2229,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);
@@ -2287,7 +2286,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
@@ -245,7 +245,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();