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

Commit e748b0a0 authored by Amit Mahajan's avatar Amit Mahajan Committed by Android (Google) Code Review
Browse files

Merge "Change to register content observer for data_roaming only after subId... 

Merge "Change to register content observer for data_roaming only after subId is updated." into lmp-mr1-dev
parents 4325c564 c03103f7

src/java/com/android/internal/telephony/dataconnection/DcTrackerBase.java

+34 −10
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.content.ContentResolver; 
import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.content.res.Resources;

import android.content.SharedPreferences;

import android.database.ContentObserver;

import android.net.ConnectivityManager;
@@ -38,24 +37,21 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.HandlerThread;

import android.os.Message;

import android.os.Messenger;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.preference.PreferenceManager;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.telephony.SubscriptionManager;

import android.telephony.SubscriptionManager.OnSubscriptionsChangedListener;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.EventLog;

import android.telephony.Rlog;

import android.telephony.ServiceState;



import com.android.internal.R;

import com.android.internal.telephony.DctConstants;

import com.android.internal.telephony.DctConstants.State;

import com.android.internal.telephony.EventLogTags;

import com.android.internal.telephony.TelephonyIntents;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneBase;

import com.android.internal.telephony.PhoneConstants;
@@ -389,6 +385,30 @@ public abstract class DcTrackerBase extends Handler { 
        }

    };



    private SubscriptionManager mSubscriptionManager;

    private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener =

            new OnSubscriptionsChangedListener() {

        /**

         * Callback invoked when there is any change to any SubscriptionInfo. Typically

         * this method would invoke {@link SubscriptionManager#getActiveSubscriptionInfoList}

         */

        @Override

        public void onSubscriptionsChanged() {

            if (DBG) log("SubscriptionListener.onSubscriptionInfoChanged");

            // Set the network type, in case the radio does not restore it.

            int subId = mPhone.getSubId();

            if (SubscriptionManager.isValidSubscriptionId(subId)) {

                if (mDataRoamingSettingObserver != null) {

                    mDataRoamingSettingObserver.unregister();

                }

                // Watch for changes to Settings.Global.DATA_ROAMING

                mDataRoamingSettingObserver = new DataRoamingSettingObserver(mPhone,

                        mPhone.getContext());

                mDataRoamingSettingObserver.register();

            }

        }

    };



    private class DataRoamingSettingObserver extends ContentObserver {



        public DataRoamingSettingObserver(Handler handler, Context context) {
@@ -414,7 +434,7 @@ public abstract class DcTrackerBase extends Handler { 
            }

        }

    }

    private final DataRoamingSettingObserver mDataRoamingSettingObserver;

    private DataRoamingSettingObserver mDataRoamingSettingObserver;



    /**

     * The Initial MaxRetry sent to a DataConnection as a parameter
@@ -591,9 +611,9 @@ public abstract class DcTrackerBase extends Handler { 
        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mPhone.getContext());

        mAutoAttachOnCreation = sp.getBoolean(PhoneBase.DATA_DISABLED_ON_BOOT_KEY, false);



        // Watch for changes to Settings.Global.DATA_ROAMING

        mDataRoamingSettingObserver = new DataRoamingSettingObserver(mPhone, mPhone.getContext());

        mDataRoamingSettingObserver.register();

        mSubscriptionManager = SubscriptionManager.from(mPhone.getContext());

        mSubscriptionManager

                .registerOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);



        HandlerThread dcHandlerThread = new HandlerThread("DcHandlerThread");

        dcHandlerThread.start();
@@ -611,7 +631,11 @@ public abstract class DcTrackerBase extends Handler { 
        mIsDisposed = true;

        mPhone.getContext().unregisterReceiver(mIntentReceiver);

        mUiccController.unregisterForIccChanged(this);

        if (mDataRoamingSettingObserver != null) {

            mDataRoamingSettingObserver.unregister();

        }

        mSubscriptionManager

                .unregisterOnSubscriptionsChangedListener(mOnSubscriptionsChangedListener);

        mDcc.dispose();

        mDcTesterFailBringUpAll.dispose();

    }