diff --git a/Android.mk b/Android.mk index c95d09c..3c35696 100644 --- a/Android.mk +++ b/Android.mk @@ -235,7 +235,8 @@ LOCAL_DROIDDOC_OPTIONS := \ -hdf sdk.rel.id $(cmplat_docs_docs_SDK_REL_ID) \ -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)/2.txt 2 \ + -since $(CM_SRC_API_DIR)/3.txt 3 $(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 2218447..df6092b 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.BOYSENBERRY; + public static final int PARCELABLE_VERSION = CM_VERSION_CODES.CANTALOUPE; private static final SparseArray sdkMap; static @@ -44,6 +44,7 @@ public class Build { sdkMap = new SparseArray(); sdkMap.put(CM_VERSION_CODES.APRICOT, "Apricot"); sdkMap.put(CM_VERSION_CODES.BOYSENBERRY, "Boysenberry"); + sdkMap.put(CM_VERSION_CODES.CANTALOUPE, "Cantaloupe"); } /** Various version strings. */ @@ -105,6 +106,11 @@ public class Build { * */ public static final int BOYSENBERRY = 2; + + /** + * TODO: Pending Q1 release + */ + public static final int CANTALOUPE = 3; } /** diff --git a/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java b/tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java index 2b83827..6c06844 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.BOYSENBERRY, Build.CM_VERSION.SDK_INT); + assertEquals(Build.CM_VERSION_CODES.CANTALOUPE, 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.BOYSENBERRY), apiName); + assertEquals(Build.getNameForSDKInt(Build.CM_VERSION_CODES.CANTALOUPE), apiName); } @SmallTest public void testSdkApiLevelSkippedIfGreaterThanAllowed() { int i = 0; - if (Build.CM_VERSION.SDK_INT > Build.CM_VERSION_CODES.BOYSENBERRY + 1) { + if (Build.CM_VERSION.SDK_INT > Build.CM_VERSION_CODES.CANTALOUPE + 1) { i++; } assertEquals(0, i);