diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | src/java/cyanogenmod/os/Build.java | 10 | ||||
| -rw-r--r-- | tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java | 6 |
3 files changed, 14 insertions, 5 deletions
@@ -236,7 +236,8 @@ LOCAL_DROIDDOC_OPTIONS := \ -hdf sdk.preview 0 \ -since $(CM_SRC_API_DIR)/1.txt 1 \ -since $(CM_SRC_API_DIR)/2.txt 2 \ - -since $(CM_SRC_API_DIR)/3.txt 3 + -since $(CM_SRC_API_DIR)/3.txt 3 \ + -since $(CM_SRC_API_DIR)/4.txt 4 $(full_target): $(cm_framework_built) $(gen) include $(BUILD_DROIDDOC) diff --git a/src/java/cyanogenmod/os/Build.java b/src/java/cyanogenmod/os/Build.java index df6092b..2574ccc 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.CANTALOUPE; + public static final int PARCELABLE_VERSION = CM_VERSION_CODES.DRAGON_FRUIT; private static final SparseArray<String> sdkMap; static @@ -45,6 +45,7 @@ public class Build { sdkMap.put(CM_VERSION_CODES.APRICOT, "Apricot"); sdkMap.put(CM_VERSION_CODES.BOYSENBERRY, "Boysenberry"); sdkMap.put(CM_VERSION_CODES.CANTALOUPE, "Cantaloupe"); + sdkMap.put(CM_VERSION_CODES.DRAGON_FRUIT, "Dragon Fruit"); } /** Various version strings. */ @@ -111,6 +112,13 @@ public class Build { * TODO: Pending Q1 release */ public static final int CANTALOUPE = 3; + + + /** + * First M Release + */ + public static final int DRAGON_FRUIT = 4; + } /** diff --git a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java index 6c06844..2cc76b7 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.CANTALOUPE, Build.CM_VERSION.SDK_INT); + assertEquals(Build.CM_VERSION_CODES.DRAGON_FRUIT, 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.CANTALOUPE), apiName); + assertEquals(Build.getNameForSDKInt(Build.CM_VERSION_CODES.DRAGON_FRUIT), apiName); } @SmallTest public void testSdkApiLevelSkippedIfGreaterThanAllowed() { int i = 0; - if (Build.CM_VERSION.SDK_INT > Build.CM_VERSION_CODES.CANTALOUPE + 1) { + if (Build.CM_VERSION.SDK_INT > Build.CM_VERSION_CODES.DRAGON_FRUIT + 1) { i++; } assertEquals(0, i); |