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

Commit b6abb3eb authored by Wink Saville's avatar Wink Saville Committed by Android (Google) Code Review
Browse files

Merge "Use SubscriptionController.getSubIdUsingPhoneId for getSubId" into lmp-dev

parents 5df100e3 a94991d3

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

+1 −9
Original line number Diff line number Diff line
@@ -1880,15 +1880,7 @@ public abstract class PhoneBase extends Handler implements Phone { 
     * Returns the subscription id.

     */

    public long getSubId() {

        long subId;



        long [] subIds = SubscriptionController.getInstance().getSubId(mPhoneId);

        if (subIds == null) {

            subId = SubscriptionManager.INVALID_SUB_ID;

        } else {

            subId = subIds[0];

        }

        return subId;

        return SubscriptionController.getInstance().getSubIdUsingPhoneId(mPhoneId);

    }



    /**