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

Commit 14d1ae6c 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 2092b451 f8d23242

android/app/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) {