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

Commit 5ebaa022 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Added transport type and id in precise data connection state am: 503f1869 

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

Change-Id: Iae73f92237912e2e905d80774e7b504c95cdb783
parents adeaa96b 503f1869

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

+2 −0
Original line number Diff line number Diff line
@@ -641,6 +641,8 @@ public class GsmCdmaPhone extends Phone { 
                || ((mSST.getCurrentDataConnectionState() != ServiceState.STATE_IN_SERVICE)

                        && !isEmergencyData)) {

            return new PreciseDataConnectionState.Builder()

                    .setTransportType(mTransportManager.getCurrentTransport(

                            ApnSetting.getApnTypesBitmaskFromString(apnType)))

                    .setState(TelephonyManager.DATA_DISCONNECTED)

                    .setApnSetting(new ApnSetting.Builder()

                            .setApnTypeBitmask(ApnSetting.getApnTypesBitmaskFromString(apnType))

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

+5 −1
Original line number Diff line number Diff line
@@ -1188,8 +1188,12 @@ public class DcTracker extends Handler { 


        ApnSetting apnSetting = getActiveApnSetting(apnType);



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

        DataConnection dc = getDataConnectionByApnType(apnType);



        // TODO: Move this entirely into Data Connection

        return new PreciseDataConnectionState.Builder()

                .setTransportType(mTransportType)

                .setId(dc != null ? dc.getCid() : -1)

                .setState(telState)

                .setNetworkType(networkType)

                .setLinkProperties(getLinkProperties(apnType))

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

+7 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import static org.mockito.Mockito.when; 
import android.content.Intent;

import android.net.LinkProperties;

import android.os.ServiceManager;

import android.telephony.AccessNetworkConstants;

import android.telephony.Annotation;

import android.telephony.PhoneCapability;

import android.telephony.PhoneStateListener;
@@ -313,6 +314,8 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        mTelephonyRegistry.notifyDataConnectionForSubscriber(

                /*phoneId*/ 0, subId, ApnSetting.TYPE_DEFAULT,

                new PreciseDataConnectionState.Builder()

                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                        .setId(1)

                        .setState(0)

                        .setNetworkType(0)

                        .setApnSetting(new ApnSetting.Builder()
@@ -332,6 +335,8 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        mTelephonyRegistry.notifyDataConnectionForSubscriber(

                /*phoneId*/ 0, subId, ApnSetting.TYPE_IMS,

                new PreciseDataConnectionState.Builder()

                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                        .setId(1)

                        .setState(0)

                        .setNetworkType(0)

                        .setApnSetting(new ApnSetting.Builder()
@@ -362,6 +367,8 @@ public class TelephonyRegistryTest extends TelephonyTest { 
        mTelephonyRegistry.notifyDataConnectionForSubscriber(

                /*phoneId*/ 0, subId, ApnSetting.TYPE_IMS,

                new PreciseDataConnectionState.Builder()

                        .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)

                        .setId(1)

                        .setState(0)

                        .setNetworkType(0)

                        .setApnSetting(new ApnSetting.Builder()