Merge changes from topic "hiddenapi-csv"

* changes:
  Support CSV hiddenapi flags in class2greylist
  hiddenapi: Convert API lists to a flags CSV file

1 files changed, 12 insertions, 2 deletions

diff --git a/libartbase/base/hiddenapi_flags.h b/libartbase/base/hiddenapi_flags.h
index 8e7269cc60..9ea01d7f3b 100644
--- a/libartbase/base/hiddenapi_flags.h
+++ b/libartbase/base/hiddenapi_flags.h
@@ -58,6 +58,8 @@ class ApiList {
     "greylist-max-o",
   };
 
+  static constexpr const char* kInvalidName = "invalid";
+
   static constexpr SdkVersion kMaxSdkVersions[] {
     /* whitelist */ SdkVersion::kMax,
     /* greylist */ SdkVersion::kMax,
@@ -70,7 +72,7 @@ class ApiList {
 
   explicit ApiList(Value value) : value_(value) {}
 
-  const Value value_;
+  Value value_;
 
  public:
   static ApiList Whitelist() { return ApiList(Value::kWhitelist); }
@@ -87,6 +89,14 @@ class ApiList {
     return Invalid();
   }
 
+  // Decodes ApiList from its integer value.
+  static ApiList FromIntValue(IntValueType int_value) {
+    if (MinValue().GetIntValue() <= int_value && int_value <= MaxValue().GetIntValue()) {
+      return ApiList(static_cast<Value>(int_value));
+    }
+    return Invalid();
+  }
+
   // Returns the ApiList with a given name.
   static ApiList FromName(const std::string& str) {
     for (IntValueType i = MinValue().GetIntValue(); i <= MaxValue().GetIntValue(); i++) {
@@ -108,7 +118,7 @@ class ApiList {
     return static_cast<IntValueType>(value_);
   }
 
-  const char* GetName() const { return kNames[GetIntValue()]; }
+  const char* GetName() const { return IsValid() ? kNames[GetIntValue()]: kInvalidName; }
 
   SdkVersion GetMaxAllowedSdkVersion() const { return kMaxSdkVersions[GetIntValue()]; }