Snap for 6650198 from 6e3f68aa489171363b5c240cb38c3b2dd475768d to rvc-releaseandroid-vts-11.0_r1android-security-11.0.0_r76android-security-11.0.0_r75android-security-11.0.0_r74android-security-11.0.0_r73android-security-11.0.0_r72android-security-11.0.0_r71android-security-11.0.0_r70android-security-11.0.0_r69android-security-11.0.0_r68android-security-11.0.0_r67android-security-11.0.0_r66android-security-11.0.0_r65android-security-11.0.0_r64android-security-11.0.0_r63android-security-11.0.0_r62android-security-11.0.0_r61android-security-11.0.0_r60android-security-11.0.0_r59android-security-11.0.0_r58android-security-11.0.0_r57android-security-11.0.0_r56android-security-11.0.0_r55android-security-11.0.0_r54android-security-11.0.0_r53android-security-11.0.0_r52android-security-11.0.0_r51android-security-11.0.0_r50android-security-11.0.0_r49android-security-11.0.0_r1android-cts-11.0_r1android-11.0.0_r5android-11.0.0_r4android-11.0.0_r3android-11.0.0_r25android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-security-releaseandroid11-s1-releaseandroid11-release

Change-Id: I3e67bfc55aecfbc5da0da996af1ec8c28d555580

1 files changed, 10 insertions, 2 deletions

diff --git a/treble/platform_version/VtsTreblePlatformVersionTest.py b/treble/platform_version/VtsTreblePlatformVersionTest.py
index 76d8ba74..bba2e69b 100644
--- a/treble/platform_version/VtsTreblePlatformVersionTest.py
+++ b/treble/platform_version/VtsTreblePlatformVersionTest.py
@@ -69,9 +69,17 @@ class VtsTreblePlatformVersionTest(base_test.BaseTestClass):
 
     def testFirstApiLevel(self):
         """Test that device launched with O or later."""
-        firstApiLevel = self.dut.getLaunchApiLevel()
-        asserts.assertTrue(firstApiLevel >= api.PLATFORM_API_LEVEL_O,
+        launchApiLevel = self.dut.GetLaunchApiLevel()
+        asserts.assertTrue(launchApiLevel >= api.PLATFORM_API_LEVEL_O,
             "VTS can only be run for new launches in O or above")
+        # Check first_api_level if device launches with P or above.
+        if launchApiLevel >= api.PLATFORM_API_LEVEL_P:
+            firstApiLevel_str = self.getProp("ro.product.first_api_level")
+            firstApiLevel = 0
+            if not firstApiLevel_str:
+                firstApiLevel = int(firstApiLevel_str)
+            asserts.assertTrue(firstApiLevel >= api.PLATFORM_API_LEVEL_P,
+                "Device running Android 9 or later MUST define PRODUCT_SHIPPING_API_LEVEL")
 
     def testTrebleEnabled(self):
         """Test that device has Treble enabled."""