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

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

Merge "Change subId to int from long" into lmp-mr1-dev

parents 050d2d9e 7d05ab1e

src/com/android/bluetooth/hfp/HeadsetPhoneState.java

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ class HeadsetPhoneState extends BroadcastReceiver{ 
    private void startListenForPhoneState() {

        if (!mListening && mSlcReady) {



            long subId = SubscriptionManager.getDefaultSubId();

            int subId = SubscriptionManager.getDefaultSubId();



            if (SubscriptionManager.isValidSubId(subId)) {

                mPhoneStateListener = getPhoneStateListener(subId);
@@ -231,7 +231,7 @@ class HeadsetPhoneState extends BroadcastReceiver{ 
        }

    }



    private PhoneStateListener getPhoneStateListener(long subId) {

    private PhoneStateListener getPhoneStateListener(int subId) {

        PhoneStateListener mPhoneStateListener = new PhoneStateListener(subId) {

            @Override

            public void onServiceStateChanged(ServiceState serviceState) {