Merge "Removed the deprecated screen state API" am: c438414190 am: 243047c574

am: 1fd613fedb

Change-Id: I11ddba206b9e2a56a9aa804878415f33c334d970

radio/1.0/IRadio.hal

@@ -730,20 +730,6 @@ interface IRadio {
      */
     oneway getDataCallList(int32_t serial);
 
-    /*
-     * Indicates the current state of the screen. When the screen is off, the
-     * Radio must notify the baseband to suppress certain notifications (eg,
-     * signal strength and changes in LAC/CID or BID/SID/NID/latitude/longitude)
-     * in an effort to conserve power. These notifications must resume when the
-     * screen is on.
-     *
-     * @param serial Serial number of request.
-     * @param enable true = screen on, false = screen off.
-     *
-     * Response function is IRadioResponse.sendScreenStateResponse()
-     */
-    oneway sendScreenState(int32_t serial, bool enable);
-
     /*
      * Enables/disables supplementary service related notifications from the network.
      * Notifications are reported via unsolSuppSvcNotification().

radio/1.0/IRadioResponse.hal

@@ -921,17 +921,6 @@ interface IRadioResponse {
      */
     oneway getDataCallListResponse(RadioResponseInfo info, vec<SetupDataCallResult> dcResponse);
 
-    /*
-     * @param info Response info struct containing response type, serial no. and error
-     *
-     * Valid errors returned:
-     *   RadioError:NONE
-     *   RadioError:RADIO_NOT_AVAILABLE
-     *   RadioError:INVALID_ARGUMENTS
-     *   RadioError:GENERIC_FAILURE
-     */
-    oneway sendScreenStateResponse(RadioResponseInfo info);
-
     /*
      * @param info Response info struct containing response type, serial no. and error
      *

radio/1.0/vts/functional/radio_hidl_hal_utils.h

@@ -234,8 +234,6 @@ public:
     Return<void> sendOemRilRequestStringsResponse(const RadioResponseInfo& info,
             const ::android::hardware::hidl_vec<::android::hardware::hidl_string>& data);
 
-    Return<void> sendScreenStateResponse(const RadioResponseInfo& info);
-
     Return<void> setSuppServiceNotificationsResponse(
             const RadioResponseInfo& info);
 

radio/1.0/vts/functional/radio_response.cpp

@@ -314,11 +314,6 @@ Return<void> RadioResponse::sendOemRilRequestStringsResponse(
     return Void();
 }
 
-Return<void> RadioResponse::sendScreenStateResponse(
-        const RadioResponseInfo& /*info*/) {
-    return Void();
-}
-
 Return<void> RadioResponse::setSuppServiceNotificationsResponse(
         const RadioResponseInfo& /*info*/) {
     return Void();