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

Merge "Changed the onQualifiedNetworkTypesChanged API"

Browse Source 
am: aa08473294

Change-Id: I138cdb9c4f2f77f7f0938e46cb5bb5db09dac2d5
This commit is contained in:
Jack Yu
2018-11-03 08:50:25 -07:00
committed by android-build-merger
parent b55d843217 aa08473294
commit 8141dd8938
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/data/IQualifiedNetworksServiceCallback.aidl
View File

@@ -22,5 +22,5 @@ package android.telephony.data;
*/
oneway interface IQualifiedNetworksServiceCallback
{
void onQualifiedNetworkTypesChanged(int apnType, in int[] qualifiedNetworkTypesList);
void onQualifiedNetworkTypesChanged(int apnTypes, in int[] qualifiedNetworkTypes);
}

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

@@ -121,27 +121,28 @@ public abstract class QualifiedNetworksService extends Service {
/**
* Update the qualified networks list. Network availability updater must invoke this method
* whenever the qualified networks changes. If this method is never invoked for certain
* APN type, then frameworks will always use the default (i.e. cellular) data and network
* APN types, then frameworks will always use the default (i.e. cellular) data and network
* service.
*
* @param apnType APN type of the qualified networks
* @param apnTypes APN types of the qualified networks. This must be a bitmask combination
* of {@link ApnSetting.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 array
* is a {@link AccessNetworkType}. An empty list or null indicates no networks are qualified
* for data setup.
*/
public final void updateQualifiedNetworkTypes(@ApnType int apnType,
public final void updateQualifiedNetworkTypes(@ApnType int apnTypes,
int[] qualifiedNetworkTypes) {
mHandler.obtainMessage(QNS_UPDATE_QUALIFIED_NETWORKS, mSlotIndex, apnType,
mHandler.obtainMessage(QNS_UPDATE_QUALIFIED_NETWORKS, mSlotIndex, apnTypes,
qualifiedNetworkTypes).sendToTarget();
}
private void onUpdateQualifiedNetworkTypes(@ApnType int apnType,
private void onUpdateQualifiedNetworkTypes(@ApnType int apnTypes,
int[] qualifiedNetworkTypes) {
mQualifiedNetworkTypesList.put(apnType, qualifiedNetworkTypes);
mQualifiedNetworkTypesList.put(apnTypes, qualifiedNetworkTypes);
if (mCallback != null) {
try {
mCallback.onQualifiedNetworkTypesChanged(apnType, qualifiedNetworkTypes);
mCallback.onQualifiedNetworkTypesChanged(apnTypes, qualifiedNetworkTypes);
} catch (RemoteException e) {
loge("Failed to call onQualifiedNetworksChanged. " + e);
}