Merge "Update OS Version in Version Canary" into pi-dev

am: e3e437a6eb

Change-Id: I5049b33a464b19f39aac68d23c5d39866b8f5c07
This commit is contained in:
John Bruce
2018-04-23 18:11:49 -07:00
committed by android-build-merger

View File

@@ -4505,7 +4505,7 @@ TEST(VersionNumberTest, VersionNumberChangeCanary) {
char release_number[PROPERTY_VALUE_MAX];
ASSERT_GT(property_get("ro.build.version.release", release_number, "Unknown"),
0);
EXPECT_STREQ("P", release_number)
EXPECT_STREQ("9", release_number)
<< "The Android version number has changed. You need to update this test "
"and also possibly update the Widevine version number in "
"properties_android.cpp.";