Update the default and the min feature level in NNAPI runtime.
Update the default and the min feature level to 8 because FL8
will be shipped with the next dessert release and there is no
mendel experiment ramping up needed.
Cherrypicked from I284efa740f8041e845e21f249ef1948e8228a98d
Test: NeuralNetworksTest_static
Bug: 209987514
Bug: 205927215
Change-Id: I284efa740f8041e845e21f249ef1948e8228a98d
Merged-In: I284efa740f8041e845e21f249ef1948e8228a98d
diff --git a/runtime/ServerFlag.h b/runtime/ServerFlag.h
index 9721d52..4b1a4da 100644
--- a/runtime/ServerFlag.h
+++ b/runtime/ServerFlag.h
@@ -32,10 +32,10 @@
constexpr char kExprCategoryName[] = "nnapi_native";
constexpr char kCurrentFeatureLevelFlagName[] = "current_feature_level";
constexpr char kTelemetryEnableFlagName[] = "telemetry_enable";
-constexpr int64_t kDefaultFeatureLevelNum = 5;
+constexpr int64_t kDefaultFeatureLevelNum = 8;
// When this value is updated, update kMinFeatureLevelCode in runtime/test/TestUpdatability.cpp with
// the corresponding ANEURALNETWORKS_FEATURE_LEVEL_* version.
-constexpr int64_t kMinFeatureLevelNum = 5;
+constexpr int64_t kMinFeatureLevelNum = 8;
constexpr int64_t kMaxFeatureLevelNum = 8;
constexpr bool kDefaultTelemetryEnableValue = false;
diff --git a/runtime/test/TestServerFlag.cpp b/runtime/test/TestServerFlag.cpp
index 3efc811..e40ee53 100644
--- a/runtime/test/TestServerFlag.cpp
+++ b/runtime/test/TestServerFlag.cpp
@@ -109,8 +109,8 @@
EXPECT_EQ(serverFeatureLevelToVersion(7), kVersionFeatureLevel7);
EXPECT_EQ(serverFeatureLevelToVersion(8), kVersionFeatureLevel8);
- EXPECT_EQ(serverFeatureLevelToVersion(kMinFeatureLevelNum), kVersionFeatureLevel5);
- EXPECT_EQ(serverFeatureLevelToVersion(kDefaultFeatureLevelNum), kVersionFeatureLevel5);
+ EXPECT_EQ(serverFeatureLevelToVersion(kMinFeatureLevelNum), kVersionFeatureLevel8);
+ EXPECT_EQ(serverFeatureLevelToVersion(kDefaultFeatureLevelNum), kVersionFeatureLevel8);
EXPECT_EQ(serverFeatureLevelToVersion(kMaxFeatureLevelNum), kVersionFeatureLevel8);
}
diff --git a/runtime/test/TestUpdatability.cpp b/runtime/test/TestUpdatability.cpp
index 1825b3e..09d5a7e 100644
--- a/runtime/test/TestUpdatability.cpp
+++ b/runtime/test/TestUpdatability.cpp
@@ -22,7 +22,7 @@
// Keep this value in sync with the corresponding value of kMinFeatureLevelNum in
// runtime/ServerFlag.h.
-constexpr int64_t kMinFeatureLevelCode = ANEURALNETWORKS_FEATURE_LEVEL_5;
+constexpr int64_t kMinFeatureLevelCode = ANEURALNETWORKS_FEATURE_LEVEL_8;
TEST_F(UpdatabilityTest, GetFeatureLevel) {
if (__builtin_available(android __NNAPI_FL5_MIN_ANDROID_API__, *)) {
