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

Commit ecc2f551 authored by Hunsuk Choi's avatar Hunsuk Choi Committed by Android (Google) Code Review
Browse files

Merge "Update IRadioNetwork and VTS for emergency domain selection"

parents 7093d8d4 98d695ab

radio/aidl/aidl_api/android.hardware.radio.network/current/android/hardware/radio/network/IRadioNetwork.aidl

+1 −1
Original line number Original line Diff line number Diff line
@@ -72,6 +72,6 @@ interface IRadioNetwork { 
  oneway void getUsageSetting(in int serial);

  oneway void getUsageSetting(in int serial);

  oneway void setEmergencyMode(int serial, in android.hardware.radio.network.EmergencyMode emcModeType);

  oneway void setEmergencyMode(int serial, in android.hardware.radio.network.EmergencyMode emcModeType);

  oneway void triggerEmergencyNetworkScan(int serial, in android.hardware.radio.network.EmergencyNetworkScanTrigger request);

  oneway void triggerEmergencyNetworkScan(int serial, in android.hardware.radio.network.EmergencyNetworkScanTrigger request);

  oneway void cancelEmergencyNetworkScan(in int serial);

  oneway void cancelEmergencyNetworkScan(int serial, boolean resetScan);

  oneway void exitEmergencyMode(in int serial);

  oneway void exitEmergencyMode(in int serial);

}
 
}

radio/aidl/android/hardware/radio/network/IRadioNetwork.aidl

+10 −7
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ package android.hardware.radio.network; 




import android.hardware.radio.AccessNetwork;

import android.hardware.radio.AccessNetwork;

import android.hardware.radio.network.CdmaRoamingType;

import android.hardware.radio.network.CdmaRoamingType;

import android.hardware.radio.network.EmergencyMode;

import android.hardware.radio.network.EmergencyNetworkScanTrigger;

import android.hardware.radio.network.IRadioNetworkIndication;

import android.hardware.radio.network.IRadioNetworkIndication;

import android.hardware.radio.network.IRadioNetworkResponse;

import android.hardware.radio.network.IRadioNetworkResponse;

import android.hardware.radio.network.IndicationFilter;

import android.hardware.radio.network.IndicationFilter;
@@ -27,8 +29,6 @@ import android.hardware.radio.network.RadioAccessSpecifier; 
import android.hardware.radio.network.RadioBandMode;

import android.hardware.radio.network.RadioBandMode;

import android.hardware.radio.network.SignalThresholdInfo;

import android.hardware.radio.network.SignalThresholdInfo;

import android.hardware.radio.network.UsageSetting;

import android.hardware.radio.network.UsageSetting;

import android.hardware.radio.network.EmergencyNetworkScanTrigger;

import android.hardware.radio.network.EmergencyMode;





/**

/**

 * This interface is used by telephony and telecom to talk to cellular radio for network APIs.

 * This interface is used by telephony and telecom to talk to cellular radio for network APIs.
@@ -455,8 +455,8 @@ oneway interface IRadioNetwork { 
     * Triggers an Emergency network scan.

     * Triggers an Emergency network scan.

     *

     *

     * @param serial Serial number of the request.

     * @param serial Serial number of the request.

     * @param request Defines the radio target networks/preferred network/

     * @param request Contains the preferred networks and type of service to be scanned.

     * Max Scan Time and type of service to be scanned.

     *                See {@link EmergencyNetworkScanTrigger}.

     *

     *

     * Response function is IRadioEmergencyResponse.triggerEmergencyNetworkScanResponse()

     * Response function is IRadioEmergencyResponse.triggerEmergencyNetworkScanResponse()

     */

     */
@@ -466,10 +466,13 @@ oneway interface IRadioNetwork { 
     * Cancels ongoing Emergency network scan

     * Cancels ongoing Emergency network scan

     *

     *

     * @param serial Serial number of the request.

     * @param serial Serial number of the request.

     * @param resetScan Indicates how the next {@link #triggerEmergencyNetworkScan} should work.

     *        If {@code true}, then the modem shall start the new scan from the beginning,

     *        otherwise the modem shall resume from the last search.

     *

     *

     * Response function is IRadioEmergencyResponse.cancelEmergencyNetworkScan()

     * Response function is IRadioEmergencyResponse.cancelEmergencyNetworkScan()

     */

     */

    void cancelEmergencyNetworkScan(in int serial);

    void cancelEmergencyNetworkScan(int serial, boolean resetScan);





    /**

    /**

     * Exits ongoing Emergency Mode

     * Exits ongoing Emergency Mode

radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl

+20 −4
Original line number Original line Diff line number Diff line
@@ -23,13 +23,13 @@ import android.hardware.radio.network.BarringInfo; 
import android.hardware.radio.network.CdmaRoamingType;

import android.hardware.radio.network.CdmaRoamingType;

import android.hardware.radio.network.CellIdentity;

import android.hardware.radio.network.CellIdentity;

import android.hardware.radio.network.CellInfo;

import android.hardware.radio.network.CellInfo;

import android.hardware.radio.network.EmergencyRegResult;

import android.hardware.radio.network.OperatorInfo;

import android.hardware.radio.network.OperatorInfo;

import android.hardware.radio.network.RadioAccessSpecifier;

import android.hardware.radio.network.RadioAccessSpecifier;

import android.hardware.radio.network.RadioBandMode;

import android.hardware.radio.network.RadioBandMode;

import android.hardware.radio.network.RegStateResult;

import android.hardware.radio.network.RegStateResult;

import android.hardware.radio.network.SignalStrength;

import android.hardware.radio.network.SignalStrength;

import android.hardware.radio.network.UsageSetting;

import android.hardware.radio.network.UsageSetting;

import android.hardware.radio.network.EmergencyRegResult;





/**

/**

 * Interface declaring response functions to solicited radio requests for network APIs.

 * Interface declaring response functions to solicited radio requests for network APIs.
@@ -575,11 +575,15 @@ oneway interface IRadioNetworkResponse { 
    oneway void getUsageSettingResponse(in RadioResponseInfo info, in UsageSetting usageSetting);

    oneway void getUsageSettingResponse(in RadioResponseInfo info, in UsageSetting usageSetting);





    /**

    /**

     * Response of setEmergencyMode.

     * This is an optional API.

     *

     * @param info Response info struct containing response type, serial no. and error.

     * @param info Response info struct containing response type, serial no. and error.

     * @param regState the current registration state of the modem.

     * @param regState the current registration state of the modem.

     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:INVALID_ARGUMENTS
@@ -587,10 +591,14 @@ oneway interface IRadioNetworkResponse { 
    void setEmergencyModeResponse(in RadioResponseInfo info, in EmergencyRegResult regState);

    void setEmergencyModeResponse(in RadioResponseInfo info, in EmergencyRegResult regState);





    /**

    /**

     * @param info Response info struct containing response type, serial no. and error

     * Response of triggerEmergencyNetworkScan.

     * This is an optional API.

     *

     * @param info Response info struct containing response type, serial no. and error.

     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:MODEM_ERR

     *   RadioError:INVALID_ARGUMENTS

     *   RadioError:INVALID_ARGUMENTS
@@ -598,20 +606,28 @@ oneway interface IRadioNetworkResponse { 
    void triggerEmergencyNetworkScanResponse(in RadioResponseInfo info);

    void triggerEmergencyNetworkScanResponse(in RadioResponseInfo info);





    /**

    /**

     * @param info Response info struct containing response type, serial no. and error

     * Response of exitEmergencyMode.

     * This is an optional API.

     *

     * @param info Response info struct containing response type, serial no. and error.

     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:MODEM_ERR

     */

     */

    void exitEmergencyModeResponse(in RadioResponseInfo info);

    void exitEmergencyModeResponse(in RadioResponseInfo info);





    /**

    /**

     * @param info Response info struct containing response type, serial no. and error

     * Response of cancelEmergencyNetworkScan.

     * This is an optional API.

     *

     * @param info Response info struct containing response type, serial no. and error.

     *

     *

     * Valid errors returned:

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:NONE

     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:MODEM_ERR

     *   RadioError:MODEM_ERR

     */

     */

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,7 @@ class RadioNetwork : public RadioCompatBase, 
            int32_t serial,

            int32_t serial,

            const ::aidl::android::hardware::radio::network::EmergencyNetworkScanTrigger&

            const ::aidl::android::hardware::radio::network::EmergencyNetworkScanTrigger&

                    scanTrigger) override;

                    scanTrigger) override;

    ::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial) override;

    ::ndk::ScopedAStatus cancelEmergencyNetworkScan(int32_t serial, bool resetScan) override;

    ::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;

    ::ndk::ScopedAStatus exitEmergencyMode(int32_t serial) override;





  protected:

  protected:

radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -326,7 +326,7 @@ ScopedAStatus RadioNetwork::triggerEmergencyNetworkScan(int32_t serial, 
    return ok();

    return ok();

}

}





ScopedAStatus RadioNetwork::cancelEmergencyNetworkScan(int32_t serial) {

ScopedAStatus RadioNetwork::cancelEmergencyNetworkScan(int32_t serial, bool) {

    LOG_CALL << serial;

    LOG_CALL << serial;

    LOG(ERROR) << " cancelEmergencyNetworkScan is unsupported by HIDL HALs";

    LOG(ERROR) << " cancelEmergencyNetworkScan is unsupported by HIDL HALs";

    respond()->cancelEmergencyNetworkScanResponse(notSupported(serial));

    respond()->cancelEmergencyNetworkScanResponse(notSupported(serial));