Revert "[test_suite] Add Location Privacy HAL"

Revert submission 20513346-LocationPrivacy-HAL

Reason for revert: Move feature to Android V

Reverted changes: /q/submissionid:20513346-LocationPrivacy-HAL

Change-Id: I58545f741e5d9e4252a1292dd9eb0c26047dafee
This commit is contained in:
Terry Huang
2022-12-26 01:39:39 +00:00
committed by Android (Google) Code Review
parent 1f79db1faa
commit b5da622cc7
5 changed files with 0 additions and 45 deletions

View File

@@ -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();

View File

@@ -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

View File

@@ -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();
}

View File

@@ -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();
}

View File

@@ -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.