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

Commit 88867404 authored by Jack Yu's avatar Jack Yu Committed by android-build-merger
Browse files

Merge "Fixed crash in data connection" am: fa22c81f 

am: 05378942

Change-Id: Idfea628e74c8fb9f947293c6ad08e086bb86bf84
parents de4d5798 05378942

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

+4 −2
Original line number Diff line number Diff line
@@ -872,7 +872,8 @@ public class DataConnection extends StateMachine { 
        if (mApnSetting != null) {

            for (String type : mApnSetting.types) {

                if (!mRestrictedNetworkOverride

                        && mConnectionParams.mUnmeteredUseOnly && ApnSetting.isMeteredApnType(type,

                        && (mConnectionParams != null && mConnectionParams.mUnmeteredUseOnly)

                        && ApnSetting.isMeteredApnType(type,

                        mPhone.getContext(), mPhone.getSubId(),

                        mPhone.getServiceState().getDataRoaming())) {

                    log("Dropped the metered " + type + " for the unmetered data call.");
@@ -935,7 +936,8 @@ public class DataConnection extends StateMachine { 
            // Mark NOT_METERED in the following cases,

            // 1. All APNs in APN settings are unmetered.

            // 2. The non-restricted data and is intended for unmetered use only.

            if ((mConnectionParams.mUnmeteredUseOnly && !mRestrictedNetworkOverride)

            if (((mConnectionParams != null && mConnectionParams.mUnmeteredUseOnly)

                    && !mRestrictedNetworkOverride)

                    || !mApnSetting.isMetered(mPhone.getContext(), mPhone.getSubId(),

                    mPhone.getServiceState().getDataRoaming())) {

                result.addCapability(NetworkCapabilities.NET_CAPABILITY_NOT_METERED);