Silence Version Number Canary

(This is a merge of http://go/wvgerrit/32280)

At the same time as the last version number canary change went in, the
version number for O-MR1 was updated to its final value. Thus, the test
never stopped failing on the dashboard. This patch silences the canary
again. No Widevine version number update is needed, since we already
updated it for O-MR1 in the previous patch.

Bug: 64951985
Test: request_license_test
Change-Id: Idf3c4b96e3f200d08a089bd08afdee8b0fd9dd76
This commit is contained in:
John W. Bruce
2017-08-24 16:04:38 -07:00
parent 481a1effcb
commit 890f535b06

View File

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