Merge "Added the new RIL request to set SIM power state" am: aefd232011 am: e23876d113

am: 437d7f8b30

Change-Id: Ie388f18bb77148a3e993108f46ca152b2b8e4093

radio/1.0/IRadio.hal

@@ -1571,6 +1571,20 @@ interface IRadio {
      */
     oneway setIndicationFilter(int32_t serial, bitfield<IndicationFilter> indicationFilter);
 
+    /*
+     * Set SIM card power state.
+     * Request is equivalent to inserting or removing the card.
+     *
+     * The radio modem must generate IRadioIndication.simStatusChanged() as if the SIM had been
+     * inserted or removed.
+     *
+     * @param serial Serial number of request
+     * @param powerUp True if powering up the sim card
+     *
+     * Response callback is IRadioResponse.setSimCardPowerResponse()
+     */
+    oneway setSimCardPower(int32_t serial, bool powerUp);
+
     /*
      * When response type received from a radio indication or radio response is
      * RadioIndicationType:UNSOLICITED_ACK_EXP or RadioResponseType:SOLICITED_ACK_EXP respectively,

radio/1.0/IRadioResponse.hal

@@ -1967,6 +1967,18 @@ interface IRadioResponse {
      */
     oneway setIndicationFilterResponse(RadioResponseInfo info);
 
+    /*
+     * @param info Response info struct containing response type, serial no. and error
+     *
+     * Valid errors returned:
+     *   RadioError:NONE
+     *   RadioError:RADIO_NOT_AVAILABLE
+     *   RadioError:REQUEST_NOT_SUPPORTED
+     *   RadioError:SIM_ABSENT
+     *   RadioError:INVALID_ARGUMENTS
+     */
+    oneway setSimCardPowerResponse(RadioResponseInfo info);
+
     /*
      * Acknowledge the receipt of radio request sent to the vendor. This must be sent only for
      * radio request which take long time to respond.

radio/1.0/vts/Radio.vts

@@ -1502,6 +1502,18 @@ interface: {
         }
     }
 
+    api: {
+        name: "setSimCardPower"
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "int32_t"
+        }
+        arg: {
+            type: TYPE_SCALAR
+            scalar_type: "bool_t"
+        }
+    }
+
     api: {
         name: "responseAcknowledgement"
     }

radio/1.0/vts/RadioResponse.vts

@@ -1388,6 +1388,14 @@ interface: {
         }
     }
 
+    api: {
+        name: "setSimCardPowerResponse"
+        arg: {
+            type: TYPE_STRUCT
+            predefined_type: "::android::hardware::radio::V1_0::RadioResponseInfo"
+        }
+    }
+
     api: {
         name: "acknowledgeRequest"
         arg: {