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

Commit 26b80b6e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix dup putPhoneIdAndSubIdExtra() for WAP PUSH" am: 23a3f977 am: 97d66629 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1318294

Change-Id: Idf950b4521c0b62daefaf9784dd0c1f0ac3e00df
parents 5a697706 97d66629

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

+0 −1
Original line number Diff line number Diff line
@@ -425,7 +425,6 @@ public class WapPushOverSms implements ServiceConnection { 
        intent.putExtra("header", result.header);

        intent.putExtra("data", result.intentData);

        intent.putExtra("contentTypeParameters", result.contentTypeParameters);

        SubscriptionManager.putPhoneIdAndSubIdExtra(intent, result.phoneId);

        if (!TextUtils.isEmpty(address)) {

            intent.putExtra("address", address);

        }