diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-11-01 09:55:09 +0000 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2018-11-29 16:42:14 +0000 |
| commit | 80d16289df2ec243737063e4f9d092ac3a7cbb10 (patch) | |
| tree | 65ee57a867a58f5ddaf42747bf49fef987c57356 /libartbase | |
| parent | e701de908bf5cb9375f15a3dbd113206aa582e7e (diff) | |
| download | art-80d16289df2ec243737063e4f9d092ac3a7cbb10.tar.gz art-80d16289df2ec243737063e4f9d092ac3a7cbb10.tar.bz2 art-80d16289df2ec243737063e4f9d092ac3a7cbb10.zip | |
hiddenapi: Introduce greylist-max-p
Add a new hiddenapi::ApiList constant for a greylist only accessible to
apps targeting SDK version < Q.
The patch also removes SdkVersion::kP_MR1 which is invalid.
Test: m, phone boots
Test: m test-art
Test: atest art/tools/class2greylist/test
Change-Id: I48f3d1a4703166168fd8e0d1c3337aa2957b66ce
Diffstat (limited to 'libartbase')
| -rw-r--r-- | libartbase/base/hiddenapi_flags.h | 6 | ||||
| -rw-r--r-- | libartbase/base/sdk_version.h | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libartbase/base/hiddenapi_flags.h b/libartbase/base/hiddenapi_flags.h index 9ea01d7f3b..8c1ffd5739 100644 --- a/libartbase/base/hiddenapi_flags.h +++ b/libartbase/base/hiddenapi_flags.h @@ -44,11 +44,12 @@ class ApiList { // The max release code implicitly includes all maintenance releases, // e.g. GreylistMaxO is accessible to targetSdkVersion <= 27 (O_MR1). kGreylistMaxO = 3, + kGreylistMaxP = 4, // Special values kInvalid = static_cast<uint32_t>(-1), kMinValue = kWhitelist, - kMaxValue = kGreylistMaxO, + kMaxValue = kGreylistMaxP, }; static constexpr const char* kNames[] = { @@ -56,6 +57,7 @@ class ApiList { "greylist", "blacklist", "greylist-max-o", + "greylist-max-p", }; static constexpr const char* kInvalidName = "invalid"; @@ -65,6 +67,7 @@ class ApiList { /* greylist */ SdkVersion::kMax, /* blacklist */ SdkVersion::kMin, /* greylist-max-o */ SdkVersion::kO_MR1, + /* greylist-max-p */ SdkVersion::kP, }; static ApiList MinValue() { return ApiList(Value::kMinValue); } @@ -79,6 +82,7 @@ class ApiList { static ApiList Greylist() { return ApiList(Value::kGreylist); } static ApiList Blacklist() { return ApiList(Value::kBlacklist); } static ApiList GreylistMaxO() { return ApiList(Value::kGreylistMaxO); } + static ApiList GreylistMaxP() { return ApiList(Value::kGreylistMaxP); } static ApiList Invalid() { return ApiList(Value::kInvalid); } // Decodes ApiList from dex hiddenapi flags. diff --git a/libartbase/base/sdk_version.h b/libartbase/base/sdk_version.h index 4372e5a02f..e2dbc502dc 100644 --- a/libartbase/base/sdk_version.h +++ b/libartbase/base/sdk_version.h @@ -33,7 +33,6 @@ enum class SdkVersion : uint32_t { kO = 26u, kO_MR1 = 27u, kP = 28u, - kP_MR1 = 29u, kMax = std::numeric_limits<uint32_t>::max(), }; |