diff --git a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h index b4461031be..f9f3c6cb33 100644 --- a/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h +++ b/radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h @@ -104,9 +104,6 @@ class RadioNetwork : public RadioCompatBase, ::ndk::ScopedAStatus setNullCipherAndIntegrityEnabled(int32_t serial, bool enabled) override; - ::ndk::ScopedAStatus setLocationPrivacySetting(int32_t serial, bool shareLocation) override; - ::ndk::ScopedAStatus getLocationPrivacySetting(int32_t serial) override; - protected: std::shared_ptr<::aidl::android::hardware::radio::network::IRadioNetworkResponse> respond(); diff --git a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp index 730b5dd902..005deaed4d 100644 --- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp +++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp @@ -360,18 +360,4 @@ ScopedAStatus RadioNetwork::setN1ModeEnabled(int32_t serial, bool /*enable*/) { respond()->setN1ModeEnabledResponse(notSupported(serial)); return ok(); } - -ScopedAStatus RadioNetwork::setLocationPrivacySetting(int32_t serial, bool /*shareLocation*/) { - LOG_CALL << serial; - LOG(ERROR) << " setLocationPrivacySetting is unsupported by HIDL HALs"; - respond()->setLocationPrivacySettingResponse(notSupported(serial)); - return ok(); -} - -ScopedAStatus RadioNetwork::getLocationPrivacySetting(int32_t serial) { - LOG_CALL << serial; - LOG(ERROR) << " getLocationPrivacySetting is unsupported by HIDL HALs"; - respond()->getLocationPrivacySettingResponse(notSupported(serial), false); - return ok(); -} } // namespace android::hardware::radio::compat diff --git a/radio/aidl/vts/radio_network_indication.cpp b/radio/aidl/vts/radio_network_indication.cpp index 71789827a4..ae3bd4b01a 100644 --- a/radio/aidl/vts/radio_network_indication.cpp +++ b/radio/aidl/vts/radio_network_indication.cpp @@ -97,8 +97,3 @@ ndk::ScopedAStatus RadioNetworkIndication::emergencyNetworkScanResult( RadioIndicationType /*type*/, const EmergencyRegResult& /*result*/) { return ndk::ScopedAStatus::ok(); } - -ndk::ScopedAStatus RadioNetworkIndication::onNetworkInitiatedLocationResult( - RadioIndicationType /*type*/, LocationResponseType /*locationResponseType*/) { - return ndk::ScopedAStatus::ok(); -} diff --git a/radio/aidl/vts/radio_network_response.cpp b/radio/aidl/vts/radio_network_response.cpp index 4f0e4f3274..c890df08a6 100644 --- a/radio/aidl/vts/radio_network_response.cpp +++ b/radio/aidl/vts/radio_network_response.cpp @@ -313,17 +313,3 @@ ndk::ScopedAStatus RadioNetworkResponse::setN1ModeEnabledResponse(const RadioRes parent_network.notify(info.serial); return ndk::ScopedAStatus::ok(); } - -ndk::ScopedAStatus RadioNetworkResponse::setLocationPrivacySettingResponse( - const RadioResponseInfo& info) { - rspInfo = info; - parent_network.notify(info.serial); - return ndk::ScopedAStatus::ok(); -} - -ndk::ScopedAStatus RadioNetworkResponse::getLocationPrivacySettingResponse( - const RadioResponseInfo& info, bool /*shareLocation*/) { - rspInfo = info; - parent_network.notify(info.serial); - return ndk::ScopedAStatus::ok(); -} diff --git a/radio/aidl/vts/radio_network_utils.h b/radio/aidl/vts/radio_network_utils.h index 92dcb1f70f..e6a320b572 100644 --- a/radio/aidl/vts/radio_network_utils.h +++ b/radio/aidl/vts/radio_network_utils.h @@ -166,12 +166,6 @@ class RadioNetworkResponse : public BnRadioNetworkResponse { const RadioResponseInfo& info, bool isEnabled) override; virtual ndk::ScopedAStatus setN1ModeEnabledResponse(const RadioResponseInfo& info) override; - - virtual ndk::ScopedAStatus setLocationPrivacySettingResponse( - const RadioResponseInfo& info) override; - - virtual ndk::ScopedAStatus getLocationPrivacySettingResponse(const RadioResponseInfo& info, - bool shareLocation) override; }; /* Callback class for radio network indication */ @@ -229,9 +223,6 @@ class RadioNetworkIndication : public BnRadioNetworkIndication { virtual ndk::ScopedAStatus emergencyNetworkScanResult( RadioIndicationType type, const EmergencyRegResult& result) override; - - virtual ndk::ScopedAStatus onNetworkInitiatedLocationResult( - RadioIndicationType type, LocationResponseType locationResponseType) override; }; // The main test class for Radio AIDL Network.