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

Commit 6cf67c9b authored by Jack Yu's avatar Jack Yu
Browse files

Moved modules into new data package 

Moved PhoneSwitcher and CellularNetworkValidator
into the new data package.

Bug: 196597630
Test: atest FrameworksTelephonyTests
Merged-In: Ic5327d9c31864dac2eb543653d3bce55396742df
Change-Id: Ic5327d9c31864dac2eb543653d3bce55396742df
parent bf0dd4d1

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ import android.telephony.TelephonyManager; 
import android.util.LocalLog;



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

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

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

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

import com.android.internal.telephony.euicc.EuiccCardController;

import com.android.internal.telephony.euicc.EuiccController;

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

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.telephony.TelephonyManager; 
import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

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

import com.android.telephony.Rlog;



import java.util.ArrayList;

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

+2 −1
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ import com.android.ims.ImsManager; 
import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.IccCardConstants.State;

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

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

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

import com.android.internal.telephony.uicc.IccUtils;

import com.android.internal.telephony.uicc.UiccCard;
@@ -4677,7 +4678,7 @@ public class SubscriptionController extends ISub.Stub { 
    /**

     * @hide

     */

    protected static void invalidateActiveDataSubIdCaches() {

    public static void invalidateActiveDataSubIdCaches() {

        if (sCachingEnabled) {

            SubscriptionManager.invalidateActiveDataSubIdCaches();

        }

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 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.data.PhoneSwitcher;

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/CellularNetworkValidator.java→src/java/com/android/internal/telephony/data/CellularNetworkValidator.java

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

 */



package com.android.internal.telephony;

package com.android.internal.telephony.data;



import static android.telephony.AccessNetworkConstants.TRANSPORT_TYPE_WWAN;

import static android.telephony.CarrierConfigManager.KEY_DATA_SWITCH_VALIDATION_MIN_GAP_LONG;
@@ -37,6 +37,10 @@ import android.telephony.SubscriptionManager; 
import android.util.Log;



import com.android.internal.annotations.VisibleForTesting;

import com.android.internal.telephony.Phone;

import com.android.internal.telephony.PhoneConfigurationManager;

import com.android.internal.telephony.PhoneFactory;

import com.android.internal.telephony.SubscriptionController;

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

import com.android.internal.telephony.nano.TelephonyProto.TelephonyEvent;