diff options
| author | Brett Chabot <brettchabot@android.com> | 2010-04-28 13:51:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-28 13:51:51 -0700 |
| commit | 4eed4048cb101fd3225d3c4fc23489205b65e9da (patch) | |
| tree | d5c00817154ab0c7bbc845763a1e5cb4db93261f | |
| parent | f97a56dcb3add555b062f55de64dd304843fcc66 (diff) | |
| parent | 830e9985cdb2897bea02b9fd0c3820af5a40be67 (diff) | |
| download | cts-4eed4048cb101fd3225d3c4fc23489205b65e9da.tar.gz | |
am 830e9985: Update CTS version numbers to 2.2.
Merge commit '830e9985cdb2897bea02b9fd0c3820af5a40be67' into froyo-plus-aosp
* commit '830e9985cdb2897bea02b9fd0c3820af5a40be67':
Update CTS version numbers to 2.2.
| -rw-r--r-- | tests/tests/os/src/android/os/cts/BuildVersionTest.java | 4 | ||||
| -rw-r--r-- | tools/host/src/com/android/cts/Version.java | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java index f8ef1f9e799..e353be9fedd 100644 --- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java +++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java @@ -27,8 +27,8 @@ import junit.framework.TestCase; public class BuildVersionTest extends TestCase { private static final String LOG_TAG = "BuildVersionTest"; - private static final String EXPECTED_RELEASE = "2.1-update1"; - private static final String EXPECTED_SDK = "7"; + private static final String EXPECTED_RELEASE = "2.2"; + private static final String EXPECTED_SDK = "8"; public void testReleaseVersion() { // Applications may rely on the exact release version diff --git a/tools/host/src/com/android/cts/Version.java b/tools/host/src/com/android/cts/Version.java index b3f6766162b..fead90995e8 100644 --- a/tools/host/src/com/android/cts/Version.java +++ b/tools/host/src/com/android/cts/Version.java @@ -18,7 +18,7 @@ package com.android.cts; public class Version { // The CTS version string - private static final String version = "2.1_r1"; + private static final String version = "2.2_r1"; private Version() { // no instances allowed |