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

Commit 4ec8323b authored by Bonian Chen's avatar Bonian Chen
Browse files

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

Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
parents 7c6a0044 81d1cd08

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -592,6 +592,9 @@ 
    <!-- Whether to aggregate for network selection list-->

    <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 -->

    <bool name="config_offer_restricted_profiles">false</bool>

src/com/android/settings/network/telephony/NetworkScanHelper.java

+12 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings.network.telephony;



import android.annotation.IntDef;

import android.content.Context;

import android.telephony.AccessNetworkConstants.AccessNetworkType;

import android.telephony.CellInfo;

import android.telephony.NetworkScan;
@@ -31,6 +32,8 @@ import androidx.annotation.VisibleForTesting; 


import com.android.internal.telephony.CellNetworkScanResult;



import com.android.settings.R;



import com.google.common.util.concurrent.FutureCallback;

import com.google.common.util.concurrent.Futures;

import com.google.common.util.concurrent.ListenableFuture;
@@ -129,6 +132,7 @@ public class NetworkScanHelper { 
    private final TelephonyScanManager.NetworkScanCallback mInternalNetworkScanCallback;

    private final Executor mExecutor;



    private int mMaxSearchTimeSec = MAX_SEARCH_TIME_SEC;

    private NetworkScan mNetworkScanRequester;



    /** Callbacks for sync network scan */
@@ -141,6 +145,13 @@ public class NetworkScanHelper { 
        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

    NetworkScanRequest createNetworkScanForPreferredAccessNetworks() {

        long networkTypeBitmap3gpp = mTelephonyManager.getPreferredNetworkTypeBitmask()
@@ -183,7 +194,7 @@ public class NetworkScanHelper { 
                radioAccessSpecifiers.toArray(

                        new RadioAccessSpecifier[radioAccessSpecifiers.size()]),

                SEARCH_PERIODICITY_SEC,

                MAX_SEARCH_TIME_SEC,

                mMaxSearchTimeSec,

                INCREMENTAL_RESULTS,

                INCREMENTAL_RESULTS_PERIODICITY_SEC,

                null /* List of PLMN ids (MCC-MNC) */);