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

Commit 0dc04ac6 authored by Wink Saville's avatar Wink Saville Committed by Android Git Automerger
Browse files

am f3cbc1e7: Revert "Additional changes to SubscriptionManager API as per API council." 

* commit 'f3cbc1e7':
  Revert "Additional changes to SubscriptionManager API as per API council."
parents ec2d92b6 f3cbc1e7

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

+13 −10
Original line number Diff line number Diff line
@@ -20,9 +20,16 @@ import android.content.Context; 
import android.telephony.PhoneStateListener;

import android.telephony.ServiceState;

import android.telephony.SignalStrength;

import android.telephony.SubscriptionListener;

import android.telephony.TelephonyManager;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.content.IntentFilter;

import android.content.Intent;

import android.content.BroadcastReceiver;



import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.PhoneConstants;



import android.util.Log;

import android.bluetooth.BluetoothDevice;
@@ -72,18 +79,14 @@ class HeadsetPhoneState { 


    private PhoneStateListener mPhoneStateListener = null;



    private SubscriptionManager mSubMgr;



    private OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =

            new OnSubscriptionsChangedListener() {

    private final SubscriptionListener mSubscriptionListener = new SubscriptionListener() {

        @Override

        public void onSubscriptionsChanged() {

        public void onSubscriptionInfoChanged() {

            listenForPhoneState(false);

            listenForPhoneState(true);

        }

    };





    HeadsetPhoneState(Context context, HeadsetStateMachine stateMachine) {

        mStateMachine = stateMachine;

        mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
@@ -92,13 +95,13 @@ class HeadsetPhoneState { 
        // Register for SubscriptionInfo list changes which is guaranteed

        // to invoke onSubscriptionInfoChanged and which in turns calls

        // loadInBackgroud.

        mSubMgr = SubscriptionManager.from(mContext);

        mSubMgr.registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        SubscriptionManager.register(mContext, mSubscriptionListener,

                SubscriptionListener.LISTEN_SUBSCRIPTION_INFO_LIST_CHANGED);

    }



    public void cleanup() {

        listenForPhoneState(false);

        mSubMgr.unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        SubscriptionManager.unregister(mContext, mSubscriptionListener);



        mTelephonyManager = null;

        mStateMachine = null;