commit 04b18a0808e6447233a7f56b2abd8367742a3d12
author Shuo Qian <shuoq@google.com> Mon Feb 01 23:21:09 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Feb 02 05:50:31 2021 +0000
tree 308cd6e826e44c75c468f8f5daa57c62e2379922
parent f6d2fac75bea97f4abf20e458dd1974de09ed612

Revert "Add cuttilefish implementation for emergencyDial_1_6"

Revert submission 1548864-cp-edial-1-6

Reason for revert: some build use some vendor ril_service.cpp
Reverted Changes:
I515ea7381:Add cuttilefish implementation for emergencyDial_1...
I94319ab34:Add emergencyDial_1_6 in the HAL to modify the mul...

Change-Id: I40de09559c6f311d3e9c3877321a39a2cc21e548
(cherry picked from commit 51be38d7731db8debe4e423aa856bc5debe4e5a6)

guest/hals/ril/reference-libril/ril_service.cpp

diff --git a/guest/hals/ril/reference-libril/ril_service.cpp b/guest/hals/ril/reference-libril/ril_service.cpp
index 35c9b4f..567161e 100644
--- a/guest/hals/ril/reference-libril/ril_service.cpp
+++ b/guest/hals/ril/reference-libril/ril_service.cpp
@@ -549,12 +549,6 @@
             const hidl_vec<hidl_string>& urns,
             ::android::hardware::radio::V1_4::EmergencyCallRouting routing,
             bool fromEmergencyDialer, bool isTesting);
-    Return<void> emergencyDial_1_6(int32_t serial,
-            const ::android::hardware::radio::V1_0::Dial& dialInfo,
-            hidl_bitfield<android::hardware::radio::V1_4::EmergencyServiceCategory> categories,
-            const hidl_vec<hidl_string>& urns,
-            ::android::hardware::radio::V1_4::EmergencyCallRouting routing,
-            bool fromEmergencyDialer, bool isTesting);
     Return<void> startNetworkScan_1_4(int32_t serial,
             const ::android::hardware::radio::V1_2::NetworkScanRequest& request);
     Return<void> getPreferredNetworkTypeBitmap(int32_t serial);
@@ -1801,87 +1795,6 @@
     return Void();
 }
 
-Return<void> RadioImpl_1_6::emergencyDial_1_6(int32_t serial,
-        const ::android::hardware::radio::V1_0::Dial& dialInfo,
-        hidl_bitfield<android::hardware::radio::V1_4::EmergencyServiceCategory> categories,
-        const hidl_vec<hidl_string>&  urns ,
-        ::android::hardware::radio::V1_4::EmergencyCallRouting routing,
-        bool fromEmergencyDialer, bool /* isTesting */) {
-#if VDBG
-    RLOGD("emergencyDial: serial %d", serial);
-#endif
-
-    RequestInfo *pRI = android::addRequestToList(serial, mSlotId, RIL_REQUEST_EMERGENCY_DIAL);
-    if (pRI == NULL) {
-        return Void();
-    }
-
-    RIL_EmergencyDial eccDial = {};
-    RIL_Dial& dial = eccDial.dialInfo;
-    RIL_UUS_Info uusInfo = {};
-
-    if (!copyHidlStringToRil(&dial.address, dialInfo.address, pRI)) {
-        return Void();
-    }
-    dial.clir = (int) dialInfo.clir;
-
-    if (dialInfo.uusInfo.size() != 0) {
-        uusInfo.uusType = (RIL_UUS_Type) dialInfo.uusInfo[0].uusType;
-        uusInfo.uusDcs = (RIL_UUS_DCS) dialInfo.uusInfo[0].uusDcs;
-
-        if (dialInfo.uusInfo[0].uusData.size() == 0) {
-            uusInfo.uusData = NULL;
-            uusInfo.uusLength = 0;
-        } else {
-            if (!copyHidlStringToRil(&uusInfo.uusData, dialInfo.uusInfo[0].uusData, pRI)) {
-                memsetAndFreeStrings(1, dial.address);
-                return Void();
-            }
-            uusInfo.uusLength = dialInfo.uusInfo[0].uusData.size();
-        }
-
-        dial.uusInfo = &uusInfo;
-    }
-
-    eccDial.urnsNumber = urns.size();
-    if (eccDial.urnsNumber != 0) {
-        char **ppUrns = (char **)calloc(eccDial.urnsNumber, sizeof(char *));
-        if (ppUrns == NULL) {
-            RLOGE("Memory allocation failed for request %s",
-                    requestToString(pRI->pCI->requestNumber));
-            sendErrorResponse(pRI, RIL_E_NO_MEMORY);
-            memsetAndFreeStrings(2, dial.address, uusInfo.uusData);
-            return Void();
-        }
-        for (uint32_t i = 0; i < eccDial.urnsNumber; i++) {
-            if (!copyHidlStringToRil(&ppUrns[i], hidl_string(urns[i]), pRI)) {
-                for (uint32_t j = 0; j < i; j++) {
-                    memsetAndFreeStrings(1, ppUrns[j]);
-                }
-                memsetAndFreeStrings(2, dial.address, uusInfo.uusData);
-                free(ppUrns);
-                return Void();
-            }
-        }
-        eccDial.urns = ppUrns;
-    }
-
-    eccDial.categories = (RIL_EmergencyServiceCategory)categories;
-    eccDial.routing = (RIL_EmergencyCallRouting)routing;
-    eccDial.fromEmergencyDialer = fromEmergencyDialer;
-
-    CALL_ONREQUEST(RIL_REQUEST_EMERGENCY_DIAL, &eccDial, sizeof(RIL_EmergencyDial), pRI, mSlotId);
-
-    memsetAndFreeStrings(2, dial.address, uusInfo.uusData);
-    if (eccDial.urns != NULL) {
-        for (size_t i = 0; i < eccDial.urnsNumber; i++) {
-            memsetAndFreeStrings(1, eccDial.urns[i]);
-        }
-        free(eccDial.urns);
-    }
-    return Void();
-}
-
 Return<void> RadioImpl_1_6::setSuppServiceNotifications(int32_t serial, bool enable) {
 #if VDBG
     RLOGD("setSuppServiceNotifications: serial %d", serial);