commit ce414351c5d42f5084ff7015b255587b3c384fca
author Yu-Han Yang <yuhany@google.com> Tue Feb 11 04:02:18 2020 +0000
committer Yu-Han Yang <yuhany@google.com> Tue Feb 11 04:02:18 2020 +0000
tree 2ff2a489ca7b39b57dd010c306fe39ae6813130f
parent 44d2b0a75ba1cc637cc0d448401d889297e1788c

Revert "Add GnssAntennaInfo to HAL"

Revert "Add GnssAntennaInfo framework APIs"

Revert "Add GnssAntennaInfo tests"

Revert submission 10111057-pco_pcv

Reason for revert: Build breakage
Reverted Changes:
I70e4014dd:Add GnssAntennaInfo framework APIs
I072958ecb:Add GnssAntennaInfo tests
Ia63a1f502:Add GnssAntennaInfo to HAL

Change-Id: I567fb52ca6c881f2e4c3c95c589bb4288f82becf

gnss/2.1/default/Gnss.cpp

diff --git a/gnss/2.1/default/Gnss.cpp b/gnss/2.1/default/Gnss.cpp
index c1af103..679eb35 100644
--- a/gnss/2.1/default/Gnss.cpp
+++ b/gnss/2.1/default/Gnss.cpp
@@ -17,7 +17,6 @@
 #define LOG_TAG "Gnss"
 
 #include "Gnss.h"
-#include "GnssAntennaInfo.h"
 #include "GnssDebug.h"
 #include "GnssMeasurement.h"
 #include "GnssMeasurementCorrections.h"
@@ -335,10 +334,9 @@
 
     sGnssCallback_2_1 = callback;
 
-    using Capabilities = V2_1::IGnssCallback::Capabilities;
+    using Capabilities = V2_0::IGnssCallback::Capabilities;
     const auto capabilities = Capabilities::MEASUREMENTS | Capabilities::MEASUREMENT_CORRECTIONS |
-                              Capabilities::LOW_POWER_MODE | Capabilities::SATELLITE_BLACKLIST |
-                              Capabilities::ANTENNA_INFO;
+                              Capabilities::LOW_POWER_MODE | Capabilities::SATELLITE_BLACKLIST;
     auto ret = sGnssCallback_2_1->gnssSetCapabilitiesCb_2_0(capabilities);
     if (!ret.isOk()) {
         ALOGE("%s: Unable to invoke callback", __func__);
@@ -376,11 +374,6 @@
     return new GnssMeasurementCorrections();
 }
 
-Return<sp<V2_1::IGnssAntennaInfo>> Gnss::getExtensionGnssAntennaInfo() {
-    ALOGD("Gnss::getExtensionGnssAntennaInfo");
-    return new GnssAntennaInfo();
-}
-
 void Gnss::reportSvStatus(const hidl_vec<GnssSvInfo>& svInfoList) const {
     std::unique_lock<std::mutex> lock(mMutex);
     // TODO(skz): update this to call 2_0 callback if non-null