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

Commit 9a0052ac authored by Ying Xu's avatar Ying Xu Committed by Android (Google) Code Review
Browse files

Merge "Add the NetworkScanRequestTracker" into oc-dr1-dev

parents 327d466a e0d956e1

src/java/com/android/internal/telephony/CommandsInterface.java

+2 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.os.Message; 
import android.os.WorkSource;

import android.service.carrier.CarrierIdentifier;

import android.telephony.ClientRequestStats;

import android.telephony.NetworkScanRequest;



import com.android.internal.telephony.cdma.CdmaSmsBroadcastConfigInfo;

import com.android.internal.telephony.dataconnection.DataProfile;
@@ -1293,7 +1294,7 @@ public interface CommandsInterface { 
     *

     * ((AsyncResult)response.obj).result is a NetworkScanResult object

     */

    void startNetworkScan(Message response);

    void startNetworkScan(NetworkScanRequest nsr, Message response);



    /**

     * Stops the ongoing network scan

src/java/com/android/internal/telephony/GsmCdmaPhone.java

+3 −2
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ import android.telecom.VideoProfile; 
import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.NetworkScanRequest;

import android.telephony.PhoneNumberUtils;

import android.telephony.Rlog;

import android.telephony.ServiceState;
@@ -1815,8 +1816,8 @@ public class GsmCdmaPhone extends Phone { 
    }



    @Override

    public void startNetworkScan(Message response) {

        mCi.startNetworkScan(response);

    public void startNetworkScan(NetworkScanRequest nsr, Message response) {

        mCi.startNetworkScan(nsr, response);

    }



    @Override

src/java/com/android/internal/telephony/NetworkScanRequestTracker.java

0 → 100644
+483 −0

File added.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/PhoneInternalInterface.java

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.os.WorkSource; 
import android.telephony.CarrierConfigManager;

import android.telephony.CellLocation;

import android.telephony.ImsiEncryptionInfo;

import android.telephony.PhoneStateListener;

import android.telephony.NetworkScanRequest;

import android.telephony.ServiceState;



import com.android.internal.telephony.PhoneConstants.*; // ????
@@ -655,7 +655,7 @@ public interface PhoneInternalInterface { 
     * on failure.</li>

     * </ul>

     */

    void startNetworkScan(Message response);

    void startNetworkScan(NetworkScanRequest nsr, Message response);



    /**

     * Stop ongoing network scan. This method is asynchronous; .

src/java/com/android/internal/telephony/RIL.java

+1 −2
Original line number Diff line number Diff line
@@ -1810,7 +1810,7 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
    }



    @Override

    public void startNetworkScan(Message result) {

    public void startNetworkScan(NetworkScanRequest nsr, Message result) {

        IRadio radioProxy = getRadioProxy(result);

        if (radioProxy != null) {

            android.hardware.radio.V1_1.IRadio radioProxy11 =
@@ -1822,7 +1822,6 @@ public final class RIL extends BaseCommands implements CommandsInterface { 
                    result.sendToTarget();

                }

            } else {

                NetworkScanRequest nsr = (NetworkScanRequest) result.obj;

                android.hardware.radio.V1_1.NetworkScanRequest request =

                        new android.hardware.radio.V1_1.NetworkScanRequest();

                request.type = nsr.scanType;