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

Partially revert ag/17294635

Browse Source 
The qualified network service change was accidentally
merged in ag/17294635. It should be merged in a different
CL. Revert back to the previous version.

Bug: 171809764
Test: Build
Change-Id: Id50e376c04141a347ff70cdc7ab7ad1fab661844
This commit is contained in:
Jack Yu
2022-03-24 23:41:45 -07:00
parent 210a64ff62
commit 5f601c4acb
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -129,31 +129,17 @@ public abstract class QualifiedNetworksService extends Service {
} }
/** /**
* Update the suggested qualified networks list. Network availability provider must invoke * Update the qualified networks list. Network availability provider must invoke this method
* this method whenever the suggested qualified networks changes. If this method is never * whenever the qualified networks changes. If this method is never invoked for certain
* invoked for certain APN types, then frameworks uses its own logic to determine the * APN types, then frameworks will always use the default (i.e. cellular) data and network
* transport to setup the data network. * service.
*
* For example, QNS can suggest frameworks to setup IMS on IWLAN by specifying
* {@link ApnSetting#TYPE_IMS} with a list containing single element
* {@link AccessNetworkType#IWLAN}.
*
* Or if QNS consider multiple access networks are qualified for certain APN type, it can
* suggest frameworks by specifying the APN type with multiple elements in the list like
* {{@link AccessNetworkType#EUTRAN}, {@link AccessNetworkType#IWLAN}}. Frameworks will then
* first attempt to setup data on LTE network. If the device moves from LTE to UMTS, then
* frameworks can 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 frameworks will decide the transport to setup the data network.
* *
* @param apnTypes APN types of the qualified networks. This must be a bitmask combination * @param apnTypes APN types of the qualified networks. This must be a bitmask combination
* of {@link ApnType}. * of {@link ApnType}.
* @param qualifiedNetworkTypes List of network types which are qualified for data * @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 * connection setup for {@link @apnType} in the preferred order. Each element in the list
* is a {@link AccessNetworkType}. Note that {@link AccessNetworkType#UNKNOWN} is not a * is a {@link AccessNetworkType}. An empty list indicates no networks are qualified
* valid input here. * for data setup.
*/ */
public final void updateQualifiedNetworkTypes( public final void updateQualifiedNetworkTypes(
@ApnType int apnTypes, @NonNull List<Integer> qualifiedNetworkTypes) { @ApnType int apnTypes, @NonNull List<Integer> qualifiedNetworkTypes) {