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

Commit cd47318c 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" into qt-dev 

am: 5a3afc8c

Change-Id: I7bea85b6f657a24b7d8b4292f83ef2f27d79da1e
parents bbe9c4b2 5a3afc8c

telephony/java/android/telephony/SubscriptionManager.java

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

            logd("putPhoneIdAndSubIdExtra: no valid subs");

            intent.putExtra(PhoneConstants.PHONE_KEY, phoneId);

            intent.putExtra(PhoneConstants.SLOT_KEY, phoneId);

        }

    }
@@ -2075,9 +2074,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);

    }



    /**