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

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

Moved AccessNetworksManager to the new package am: d32cd920 

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

Change-Id: I68017c333c149961afcfd31ee0e3bf88c8bc3a4a
parents 2c9d08c9 d32cd920

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

+1 −1
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ import com.android.ims.ImsManager; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.cdma.CdmaMmiCode;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.data.AccessNetworksManager;

import com.android.internal.telephony.data.DataNetworkController;

import com.android.internal.telephony.data.LinkBandwidthEstimator;

import com.android.internal.telephony.dataconnection.AccessNetworksManager;

import com.android.internal.telephony.dataconnection.DataEnabledSettings;

import com.android.internal.telephony.dataconnection.DcTracker;

import com.android.internal.telephony.dataconnection.TransportManager;

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

+1 −1
Original line number Diff line number Diff line
@@ -76,9 +76,9 @@ import com.android.ims.ImsException; 
import com.android.ims.ImsManager;

import com.android.internal.R;

import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.data.AccessNetworksManager;

import com.android.internal.telephony.data.DataNetworkController;

import com.android.internal.telephony.data.LinkBandwidthEstimator;

import com.android.internal.telephony.dataconnection.AccessNetworksManager;

import com.android.internal.telephony.dataconnection.DataConnectionReasons;

import com.android.internal.telephony.dataconnection.DataEnabledSettings;

import com.android.internal.telephony.dataconnection.DcTracker;

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

+1 −1
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import android.text.TextUtils; 
import com.android.ims.ImsManager;

import com.android.internal.telephony.cdma.CdmaSubscriptionSourceManager;

import com.android.internal.telephony.cdma.EriManager;

import com.android.internal.telephony.data.AccessNetworksManager;

import com.android.internal.telephony.data.DataNetworkController;

import com.android.internal.telephony.data.LinkBandwidthEstimator;

import com.android.internal.telephony.dataconnection.AccessNetworksManager;

import com.android.internal.telephony.dataconnection.DataEnabledSettings;

import com.android.internal.telephony.dataconnection.DcTracker;

import com.android.internal.telephony.dataconnection.TransportManager;

src/java/com/android/internal/telephony/data/AccessNetworksManager.java

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.internal.telephony.dataconnection;

package com.android.internal.telephony.data;



import android.annotation.NonNull;

import android.annotation.StringDef;
@@ -52,7 +52,7 @@ import android.util.SparseArray; 


import com.android.internal.telephony.Phone;

import com.android.internal.telephony.RIL;

import com.android.internal.telephony.data.DataUtils;

import com.android.internal.telephony.dataconnection.DataThrottler;

import com.android.telephony.Rlog;



import java.io.FileDescriptor;
@@ -111,7 +111,7 @@ public class AccessNetworksManager extends Handler { 
    private final UUID mAnomalyUUID = UUID.fromString("c2d1a639-00e2-4561-9619-6acf37d90590");

    private String mLastBoundPackageName;



    static final int[] SUPPORTED_APN_TYPES = {

    public static final int[] SUPPORTED_APN_TYPES = {

            ApnSetting.TYPE_DEFAULT,

            ApnSetting.TYPE_MMS,

            ApnSetting.TYPE_FOTA,

src/java/com/android/internal/telephony/data/DataNetwork.java

+0 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ import com.android.internal.telephony.PhoneConstants; 
import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.data.DataNetworkController.NetworkRequestList;

import com.android.internal.telephony.data.TelephonyNetworkAgent.TelephonyNetworkAgentCallback;

import com.android.internal.telephony.dataconnection.AccessNetworksManager;

import com.android.internal.telephony.metrics.TelephonyMetrics;

import com.android.internal.util.IState;

import com.android.internal.util.State;