Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "mvno_matching"

Browse Source 
* changes:
  Document the QNS behavior
  Partially revert ag/17294635
  Moved MVNO matching logic out of old data stack
This commit is contained in:
Jack Yu
2022-05-27 02:43:25 +00:00
committed by Gerrit Code Review
parent cf852e7c52 14111703f3
commit a5fa62bcad
3 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -14837,7 +14837,7 @@ public class TelephonyManager {
}
ITelephony service = getITelephony();
if (service != null) {
return service.isMvnoMatched(getSubId(), mvnoType, mvnoMatchData);
return service.isMvnoMatched(getSlotIndex(), mvnoType, mvnoMatchData);
}
} catch (RemoteException ex) {
Rlog.e(TAG, "Telephony#matchesCurrentSimOperator RemoteException" + ex);

40
telephony/java/android/telephony/data/QualifiedNetworksService.java
View File

@@ -26,6 +26,7 @@ import android.os.IBinder;
import android.os.Looper;
import android.os.Message;
import android.os.RemoteException;
import android.telephony.AccessNetworkConstants;
import android.telephony.AccessNetworkConstants.AccessNetworkType;
import android.telephony.Annotation.ApnType;
import android.util.Log;
@@ -129,17 +130,36 @@ public abstract class QualifiedNetworksService extends Service {
}
/**
* Update the qualified networks list. Network availability provider must invoke this method
* whenever the qualified networks changes. If this method is never invoked for certain
* APN types, then frameworks will always use the default (i.e. cellular) data and network
* service.
* Update the suggested qualified networks list. Network availability provider must invoke
* this method whenever the suggested qualified networks changes. If this method is never
* invoked for certain APN types, then frameworks uses its own logic to determine the
* transport to setup the data network.
*
* @param apnTypes APN types of the qualified networks. This must be a bitmask combination
* of {@link ApnType}.
* @param qualifiedNetworkTypes List of network types which are qualified for data
* connection setup for {@link @apnType} in the preferred order. Each element in the list
* is a {@link AccessNetworkType}. An empty list indicates no networks are qualified
* for data setup.
* For example, QNS can suggest frameworks setting up IMS data network on IWLAN by
* specifying {@link ApnSetting#TYPE_IMS} with a list containing
* {@link AccessNetworkType#IWLAN}.
*
* If QNS considers multiple access networks qualified for certain APN type, it can
* suggest frameworks by specifying the APN type with multiple access networks in the list,
* for example {{@link AccessNetworkType#EUTRAN}, {@link AccessNetworkType#IWLAN}}.
* Frameworks will then first attempt to setup data on LTE network, and If the device moves
* from LTE to UMTS, then frameworks will perform handover the data network to the second
* preferred access network if available.
*
* If the {@code qualifiedNetworkTypes} list is empty, it means QNS has no suggestion to the
* frameworks, and for that APN type frameworks will route the corresponding network
* requests to {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}.
*
* @param apnTypes APN type(s) of the qualified networks. This must be a bitmask combination
* of {@link ApnType}. The same qualified networks will be applicable to all APN types
* specified here.
* @param qualifiedNetworkTypes List of access network types which are qualified for data
* connection setup for {@code apnTypes} in the preferred order. Empty list means QNS has no
* suggestion to the frameworks, and for that APN type frameworks will route the
* corresponding network requests to {@link AccessNetworkConstants#TRANSPORT_TYPE_WWAN}.
*
* If one of the element is invalid, for example, {@link AccessNetworkType#UNKNOWN}, then
* this operation becomes a no-op.
*/
public final void updateQualifiedNetworkTypes(
@ApnType int apnTypes, @NonNull List<Integer> qualifiedNetworkTypes) {

2
telephony/java/com/android/internal/telephony/ITelephony.aidl
View File

@@ -2148,7 +2148,7 @@ interface ITelephony {
List<RadioAccessSpecifier> getSystemSelectionChannels(int subId);
boolean isMvnoMatched(int subId, int mvnoType, String mvnoMatchData);
boolean isMvnoMatched(int slotIndex, int mvnoType, String mvnoMatchData);
/**
* Enqueue a pending sms Consumer, which will answer with the user specified selection for an