Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a54e05c2 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 12L

Bug: 222710654
Merged-In: I3b9c8a3d4d36cc03b6648b2c7a7b5a10706ec87d
Change-Id: Ib5060c5a5376a4b5acacc066e76c610d39f20ad3
parents b3bdf384 97fe2742
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ func getFinalCodenamesMap(config Config) map[string]int {
			"Q":     29,
			"R":     30,
			"S":     31,
			"S-V2":  32,
		}

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