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

Commit cff25ffb authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Remember mobile nets availability

Change-Id: I402ac64bf477b0b600b17f0267c2ff5c19ab9cf3
parent eb91e78f
Loading
Loading
Loading
Loading
+3 −22
Original line number Diff line number Diff line
@@ -160,7 +160,6 @@ public class MobileDataStateTracker implements NetworkStateTracker {
            if (intent.getAction().equals(TelephonyIntents.
                    ACTION_ANY_DATA_CONNECTION_STATE_CHANGED)) {
                String apnType = intent.getStringExtra(Phone.DATA_APN_TYPE_KEY);

                if (!TextUtils.equals(apnType, mApnType)) {
                    return;
                }
@@ -169,9 +168,8 @@ public class MobileDataStateTracker implements NetworkStateTracker {
                String reason = intent.getStringExtra(Phone.STATE_CHANGE_REASON_KEY);
                String apnName = intent.getStringExtra(Phone.DATA_APN_KEY);

                boolean unavailable = intent.getBooleanExtra(Phone.NETWORK_UNAVAILABLE_KEY,
                        false);
                mNetworkInfo.setIsAvailable(!unavailable);
                mNetworkInfo.setIsAvailable(!intent.getBooleanExtra(Phone.NETWORK_UNAVAILABLE_KEY,
                        false));

                if (DBG) Log.d(TAG, mApnType + " Received state= " + state + ", old= " +
                        mMobileDataState + ", reason= " +
@@ -267,24 +265,7 @@ public class MobileDataStateTracker implements NetworkStateTracker {
     * Report whether data connectivity is possible.
     */
    public boolean isAvailable() {
        getPhoneService(false);

        /*
         * If the phone process has crashed in the past, we'll get a
         * RemoteException and need to re-reference the service.
         */
        for (int retry = 0; retry < 2; retry++) {
            if (mPhoneService == null) break;

            try {
                return mPhoneService.isDataConnectivityPossible();
            } catch (RemoteException e) {
                // First-time failed, get the phone service again
                if (retry == 0) getPhoneService(true);
            }
        }

        return false;
        return mNetworkInfo.isAvailable();
    }

    /**