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

Commit 0be50c1d authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Removed APN name and types from PreciseDataConnectionState am: 90ccecc2 am:... 

Removed APN name and types from PreciseDataConnectionState am: 90ccecc2 am: adeaa96b am: ad7d84e0 am: d4a78846

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1435716

Change-Id: I7aa27869cf38a7a760e6d2c3a5b5e1840f85a701
parents 805a255d d4a78846

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −2
Original line number Diff line number Diff line
@@ -642,8 +642,9 @@ public class GsmCdmaPhone extends Phone { 
                        && !isEmergencyData)) {

            return new PreciseDataConnectionState.Builder()

                    .setState(TelephonyManager.DATA_DISCONNECTED)

                    .setApnTypes(ApnSetting.getApnTypesBitmaskFromString(apnType))

                    .setApn(apnType)

                    .setApnSetting(new ApnSetting.Builder()

                            .setApnTypeBitmask(ApnSetting.getApnTypesBitmaskFromString(apnType))

                            .build())

                    .build();

        }

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

+0 −3
Original line number Diff line number Diff line
@@ -1188,14 +1188,11 @@ public class DcTracker extends Handler { 
        }



        ApnSetting apnSetting = getActiveApnSetting(apnType);

        int apnTypesBitmask = ApnSetting.getApnTypesBitmaskFromString(apnType);



        // TODO: should the data fail cause be populated?

        return new PreciseDataConnectionState.Builder()

                .setState(telState)

                .setNetworkType(networkType)

                .setApnTypes(apnTypesBitmask)

                .setApn(apnType)

                .setLinkProperties(getLinkProperties(apnType))

                .setApnSetting(apnSetting)

                .build();

tests/telephonytests/src/com/android/internal/telephony/TelephonyRegistryTest.java

+9 −6
Original line number Diff line number Diff line
@@ -315,8 +315,9 @@ public class TelephonyRegistryTest extends TelephonyTest { 
                new PreciseDataConnectionState.Builder()

                        .setState(0)

                        .setNetworkType(0)

                        .setApnTypes(0)

                        .setApn("default")

                        .setApnSetting(new ApnSetting.Builder()

                                .setApnTypeBitmask(ApnSetting.TYPE_DEFAULT)

                                .build())

                        .setLinkProperties(new LinkProperties())

                        .setFailCause(0)

                        .build());
@@ -333,8 +334,9 @@ public class TelephonyRegistryTest extends TelephonyTest { 
                new PreciseDataConnectionState.Builder()

                        .setState(0)

                        .setNetworkType(0)

                        .setApnTypes(0)

                        .setApn("ims")

                        .setApnSetting(new ApnSetting.Builder()

                                .setApnTypeBitmask(ApnSetting.TYPE_IMS)

                                .build())

                        .setLinkProperties(new LinkProperties())

                        .setFailCause(0)

                        .build());
@@ -362,8 +364,9 @@ public class TelephonyRegistryTest extends TelephonyTest { 
                new PreciseDataConnectionState.Builder()

                        .setState(0)

                        .setNetworkType(0)

                        .setApnTypes(0)

                        .setApn("ims")

                        .setApnSetting(new ApnSetting.Builder()

                                .setApnTypeBitmask(ApnSetting.TYPE_IMS)

                                .build())

                        .setLinkProperties(new LinkProperties())

                        .setFailCause(0)

                        .build());