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

Commit 99d32be1 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am 14d1ae6c: Merge "Change subId to int from long" into lmp-mr1-dev 

* commit '14d1ae6c':
  Change subId to int from long
parents 1d4e0227 14d1ae6c

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

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

    private void startListenForPhoneState() {

        if (!mListening && mSlcReady) {

        if (!mListening && mSlcReady) {





            long subId = SubscriptionManager.getDefaultSubId();

            int subId = SubscriptionManager.getDefaultSubId();





            if (SubscriptionManager.isValidSubId(subId)) {

            if (SubscriptionManager.isValidSubId(subId)) {

                mPhoneStateListener = getPhoneStateListener(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) {

        PhoneStateListener mPhoneStateListener = new PhoneStateListener(subId) {

            @Override

            @Override

            public void onServiceStateChanged(ServiceState serviceState) {

            public void onServiceStateChanged(ServiceState serviceState) {