Merge "Merge Android 12L"

This commit is contained in:
Xin Li
2022-03-08 06:52:32 +00:00
committed by Gerrit Code Review

View File

@@ -321,6 +321,7 @@ func getFinalCodenamesMap(config Config) map[string]int {
"Q": 29, "Q": 29,
"R": 30, "R": 30,
"S": 31, "S": 31,
"S-V2": 32,
} }
// TODO: Differentiate "current" and "future". // TODO: Differentiate "current" and "future".
@@ -364,6 +365,7 @@ func GetApiLevelsMap(config Config) map[string]int {
"Q": 29, "Q": 29,
"R": 30, "R": 30,
"S": 31, "S": 31,
"S-V2": 32,
} }
for i, codename := range config.PlatformVersionActiveCodenames() { for i, codename := range config.PlatformVersionActiveCodenames() {
apiLevelsMap[codename] = previewAPILevelBase + i apiLevelsMap[codename] = previewAPILevelBase + i