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

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

Merge "Moved DcNetworkAgent into a static class" 

am: 3626049d

Change-Id: I883a3bdbbb8ef4487e85d38c3d7b549d46bc7b4f
parents 970e15de 3626049d

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

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ public interface PhoneInternalInterface { 
    static final String REASON_CARRIER_ACTION_DISABLE_METERED_APN =

            "carrierActionDisableMeteredApn";

    static final String REASON_CSS_INDICATOR_CHANGED = "cssIndicatorChanged";

    static final String REASON_RELEASED_BY_CONNECTIVITY_SERVICE = "releasedByConnectivityService";



    // Used for band mode selection methods

    static final int BM_UNSPECIFIED = RILConstants.BAND_MODE_UNSPECIFIED; // automatic

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

+299 −137

File changed.

Preview size limit exceeded, changes collapsed.

tests/telephonytests/src/com/android/internal/telephony/dataconnection/DataConnectionTest.java

+3 −4
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import static org.mockito.ArgumentMatchers.any; 
import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;
@@ -741,9 +740,9 @@ public class DataConnectionTest extends TelephonyTest { 
        testConnectEvent();

        waitForMs(200);



        DataServiceManager mockDsm = mock(DataServiceManager.class);

        doReturn(AccessNetworkConstants.TRANSPORT_TYPE_WLAN).when(mockDsm).getTransportType();

        replaceInstance(DataConnection.class, "mDataServiceManager", mDc, mockDsm);

        Field field = DataConnection.class.getDeclaredField("mTransportType");

        field.setAccessible(true);

        field.setInt(mDc, AccessNetworkConstants.TRANSPORT_TYPE_WLAN);



        final int sessionHandle = 0xF00;

        final int slotId = 3;