ADHOC
/
replicant-vendor_cmsdk
3
0
Fork 0
Code Issues Pull Requests Releases Activity

cmsdk: API level 4 for M release. 

Change-Id: Ieed8ebf256e91515b6921186487b83462910bca9
This commit is contained in:
Adnan Begovic 2015-10-07 11:32:41 -07:00
parent 5c29aa4e50
commit 4e53461e71
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -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)

10
src/java/cyanogenmod/os/Build.java
View File

@ -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;
}
/**

6
tests/src/org/cyanogenmod/tests/versioning/unit/BuildTest.java
View File

@ -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);