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

Commit 15df31ba authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "Do not populate SLOT_KEY with wrong slot info" 

am: b3fded4d

Change-Id: Idf9900e5201c242651e1491235bdeaced4ec8292
parents a788bd93 b3fded4d

telephony/java/android/telephony/SubscriptionManager.java

+0 −4
Original line number Diff line number Diff line
@@ -2065,7 +2065,6 @@ public class SubscriptionManager { 
        } else {

            logd("putPhoneIdAndSubIdExtra: no valid subs");

            intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);

            intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);

        }

    }
@@ -2076,9 +2075,6 @@ public class SubscriptionManager { 
        intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);

        intent.putExtra(EXTRA_SUBSCRIPTION_INDEX, subId);

        intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);

        //FIXME this is using phoneId and slotIndex interchangeably

        //Eventually, this should be removed as it is not the slot id

        intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);

    }



    /**