commit 9788b6982c47059905ec62d9faf4978996d2b298
author Nicolas Geoffray <ngeoffray@google.com> Thu Jan 24 14:23:22 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Thu Jan 24 14:58:53 2019 +0000
tree 0dcd2e04af3bbba7b5ae581f0a01d347a2d09a01
parent 44bbff64196ee5d9ce16ad8543417a8a075d31aa

Fix braino in HiddenApi::IsInAnyList.

Bug: 123311905
Test: m
Change-Id: I00ac35a6359036b9a7d69dadf2c0e780a7e1ee17

tools/veridex/hidden_api.h

diff --git a/tools/veridex/hidden_api.h b/tools/veridex/hidden_api.h
index 3c7f29a..e1b67a2 100644
--- a/tools/veridex/hidden_api.h
+++ b/tools/veridex/hidden_api.h
@@ -41,7 +41,7 @@
   }
 
   bool IsInAnyList(const std::string& name) const {
-    return GetApiList(name).IsEmpty();
+    return !GetApiList(name).IsEmpty();
   }
 
   static std::string GetApiMethodName(const DexFile& dex_file, uint32_t method_index);

tools/veridex/hidden_api_finder.cc

diff --git a/tools/veridex/hidden_api_finder.cc b/tools/veridex/hidden_api_finder.cc
index 3cd7c95..fe6d88a 100644
--- a/tools/veridex/hidden_api_finder.cc
+++ b/tools/veridex/hidden_api_finder.cc
@@ -180,6 +180,7 @@
   for (const std::pair<const std::string,
                        std::vector<MethodReference>>& pair : method_locations_) {
     hiddenapi::ApiList api_list = hidden_api_.GetApiList(pair.first);
+    CHECK(api_list.IsValid());
     stats->api_counts[api_list.GetIntValue()]++;
     os << "#" << ++stats->count << ": Linking " << api_list << " " << pair.first << " use(s):";
     os << std::endl;
@@ -191,6 +192,7 @@
   for (const std::pair<const std::string,
                        std::vector<MethodReference>>& pair : field_locations_) {
     hiddenapi::ApiList api_list = hidden_api_.GetApiList(pair.first);
+    CHECK(api_list.IsValid());
     stats->api_counts[api_list.GetIntValue()]++;
     os << "#" << ++stats->count << ": Linking " << api_list << " " << pair.first << " use(s):";
     os << std::endl;