PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 81d1cd0871 to stage-aosp-master

Browse Source 
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
This commit is contained in:
Bonian Chen
2022-07-29 07:22:10 +00:00
parent 7c6a004452 81d1cd0871
commit 4ec8323bad
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/values/config.xml
View File

@@ -592,6 +592,9 @@
<!-- Whether to aggregate for network selection list--> <!-- Whether to aggregate for network selection list-->
<bool name="config_network_selection_list_aggregation_enabled">false</bool> <bool name="config_network_selection_list_aggregation_enabled">false</bool>
<!-- Max network scan search time in seconds -->
<integer name="config_network_scan_helper_max_search_time_sec">300</integer>
<!-- Whether to give option to add restricted profiles --> <!-- Whether to give option to add restricted profiles -->
<bool name="config_offer_restricted_profiles">false</bool> <bool name="config_offer_restricted_profiles">false</bool>

13
src/com/android/settings/network/telephony/NetworkScanHelper.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.network.telephony; package com.android.settings.network.telephony;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.content.Context;
import android.telephony.AccessNetworkConstants.AccessNetworkType; import android.telephony.AccessNetworkConstants.AccessNetworkType;
import android.telephony.CellInfo; import android.telephony.CellInfo;
import android.telephony.NetworkScan; import android.telephony.NetworkScan;
@@ -31,6 +32,8 @@ import androidx.annotation.VisibleForTesting;
import com.android.internal.telephony.CellNetworkScanResult; import com.android.internal.telephony.CellNetworkScanResult;
import com.android.settings.R;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
@@ -129,6 +132,7 @@ public class NetworkScanHelper {
private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback; private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;
private final Executor mExecutor; private final Executor mExecutor;
private int mMaxSearchTimeSec = MAX_SEARCH_TIME_SEC;
private NetworkScan mNetworkScanRequester; private NetworkScan mNetworkScanRequester;
/** Callbacks for sync network scan */ /** Callbacks for sync network scan */
@@ -141,6 +145,13 @@ public class NetworkScanHelper {
mExecutor = executor; mExecutor = executor;
} }
public NetworkScanHelper(Context context, TelephonyManager tm, NetworkScanCallback callback,
Executor executor) {
this(tm, callback, executor);
mMaxSearchTimeSec = context.getResources().getInteger(
R.integer.config_network_scan_helper_max_search_time_sec);
}
@VisibleForTesting @VisibleForTesting
NetworkScanRequest createNetworkScanForPreferredAccessNetworks() { NetworkScanRequest createNetworkScanForPreferredAccessNetworks() {
long networkTypeBitmap3gpp = mTelephonyManager.getPreferredNetworkTypeBitmask() long networkTypeBitmap3gpp = mTelephonyManager.getPreferredNetworkTypeBitmask()
@@ -183,7 +194,7 @@ public class NetworkScanHelper {
radioAccessSpecifiers.toArray( radioAccessSpecifiers.toArray(
new RadioAccessSpecifier[radioAccessSpecifiers.size()]), new RadioAccessSpecifier[radioAccessSpecifiers.size()]),
SEARCH_PERIODICITY_SEC, SEARCH_PERIODICITY_SEC,
MAX_SEARCH_TIME_SEC, mMaxSearchTimeSec,
INCREMENTAL_RESULTS, INCREMENTAL_RESULTS,
INCREMENTAL_RESULTS_PERIODICITY_SEC, INCREMENTAL_RESULTS_PERIODICITY_SEC,
null /* List of PLMN ids (MCC-MNC) */); null /* List of PLMN ids (MCC-MNC) */);