aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-01-19 13:43:16 -0800
committerAdnan Begovic <adnan@cyngn.com>2016-01-19 13:43:16 -0800
commit80001bff72e8f73d44223655d6d2f33d674b134d (patch)
tree3f0a6044ab92e64d54ed0691ed0a51b189643314
parent735333ce4a08275dd51953aed6193e9f0ce7c172 (diff)
downloadvendor_cmsdk-80001bff72e8f73d44223655d6d2f33d674b134d.zip
vendor_cmsdk-80001bff72e8f73d44223655d6d2f33d674b134d.tar.gz
vendor_cmsdk-80001bff72e8f73d44223655d6d2f33d674b134d.tar.bz2
cmsdk: Fix BuildTests. Bump parcelable version.
Change-Id: I3084acfa25ca6bd6f5a058995906a050e243a4c9
-rw-r--r--src/java/cyanogenmod/os/Build.java2
-rw-r--r--tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/java/cyanogenmod/os/Build.java b/src/java/cyanogenmod/os/Build.java
index 058c296..89ac537 100644
--- a/src/java/cyanogenmod/os/Build.java
+++ b/src/java/cyanogenmod/os/Build.java
@@ -36,7 +36,7 @@ public class Build {
* {@link CM_VERSION_CODES}
* @hide
*/
- public static final int PARCELABLE_VERSION = CM_VERSION_CODES.DRAGON_FRUIT;
+ public static final int PARCELABLE_VERSION = CM_VERSION_CODES.ELDERBERRY;
/** A build ID utilized to distinguish cyanogenmod versions */
public static final String CYANOGENMOD_VERSION = "ro.cm.version";
diff --git a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java
index 2cc76b7..3e0be19 100644
--- a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java
+++ b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java
@@ -38,20 +38,20 @@ public class BuildTest extends AndroidTestCase {
@SmallTest
public void testSdkApiLevelCurrent() {
- assertEquals(Build.CM_VERSION_CODES.DRAGON_FRUIT, Build.CM_VERSION.SDK_INT);
+ assertEquals(Build.PARCELABLE_VERSION, Build.CM_VERSION.SDK_INT);
}
@SmallTest
public void testSdkApiLevelCanMatch() {
String apiName = Build.getNameForSDKInt(Build.CM_VERSION.SDK_INT);
assertNotNull(apiName);
- assertEquals(Build.getNameForSDKInt(Build.CM_VERSION_CODES.DRAGON_FRUIT), apiName);
+ assertEquals(Build.getNameForSDKInt(Build.PARCELABLE_VERSION), apiName);
}
@SmallTest
public void testSdkApiLevelSkippedIfGreaterThanAllowed() {
int i = 0;
- if (Build.CM_VERSION.SDK_INT > Build.CM_VERSION_CODES.DRAGON_FRUIT + 1) {
+ if (Build.CM_VERSION.SDK_INT > Build.PARCELABLE_VERSION + 1) {
i++;
}
assertEquals(0, i);