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

cmsdk: Introduce Fig, api level 6. 

Change-Id: I2916b1462c1f0b9582f4fefac82f60c20f820b85
TICKET: CYNGNOS-2303
This commit is contained in:
Adnan Begovic 2016-04-01 15:39:53 -07:00
parent 877a0234fa
commit 6b879f36e4
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Android.mk
View File

@ -202,7 +202,7 @@ cmplat_docs_java_libraries := \
cmplat_docs_SDK_VERSION := 13.0 cmplat_docs_SDK_VERSION := 13.0
# release version # release version
cmplat_docs_SDK_REL_ID := 5 cmplat_docs_SDK_REL_ID := 6
cmplat_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES cmplat_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
@ -309,7 +309,8 @@ LOCAL_DROIDDOC_OPTIONS := \
-since $(CM_SRC_API_DIR)/2.txt 2 \ -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 \ -since $(CM_SRC_API_DIR)/4.txt 4 \
-since $(CM_SRC_API_DIR)/5.txt 5 -since $(CM_SRC_API_DIR)/5.txt 5 \
-since $(CM_SRC_API_DIR)/6.txt 6
$(full_target): $(cm_framework_built) $(gen) $(full_target): $(cm_framework_built) $(gen)
include $(BUILD_DROIDDOC) include $(BUILD_DROIDDOC)

1
api/cm_current.txt
View File

@ -583,6 +583,7 @@ package cyanogenmod.os {
field public static final int CANTALOUPE = 3; // 0x3 field public static final int CANTALOUPE = 3; // 0x3
field public static final int DRAGON_FRUIT = 4; // 0x4 field public static final int DRAGON_FRUIT = 4; // 0x4
field public static final int ELDERBERRY = 5; // 0x5 field public static final int ELDERBERRY = 5; // 0x5
field public static final int FIG = 6; // 0x6
} }
public final class Concierge { public final class Concierge {

6
sdk/src/java/cyanogenmod/os/Build.java
View File

@ -42,6 +42,7 @@ public class Build {
sdkMap.put(CM_VERSION_CODES.CANTALOUPE, "Cantaloupe"); sdkMap.put(CM_VERSION_CODES.CANTALOUPE, "Cantaloupe");
sdkMap.put(CM_VERSION_CODES.DRAGON_FRUIT, "Dragon Fruit"); sdkMap.put(CM_VERSION_CODES.DRAGON_FRUIT, "Dragon Fruit");
sdkMap.put(CM_VERSION_CODES.ELDERBERRY, "Elderberry"); sdkMap.put(CM_VERSION_CODES.ELDERBERRY, "Elderberry");
sdkMap.put(CM_VERSION_CODES.FIG, "Fig");
} }
/** Various version strings. */ /** Various version strings. */
@ -148,6 +149,11 @@ public class Build {
* </ul> * </ul>
*/ */
public static final int ELDERBERRY = 5; public static final int ELDERBERRY = 5;
/**
* Future Release - 3rd quarter 2016
*/
public static final int FIG = 6;
} }
/** /**

2
sdk/src/java/cyanogenmod/os/Concierge.java
View File

@ -64,7 +64,7 @@ public final class Concierge {
* {@link CM_VERSION_CODES} * {@link CM_VERSION_CODES}
* @hide * @hide
*/ */
public static final int PARCELABLE_VERSION = CM_VERSION_CODES.ELDERBERRY; public static final int PARCELABLE_VERSION = CM_VERSION_CODES.FIG;
/** /**
* Tell the concierge to receive our parcel, so we can get information from it. * Tell the concierge to receive our parcel, so we can get information from it.

1
system-api/cm_system-current.txt
View File

@ -583,6 +583,7 @@ package cyanogenmod.os {
field public static final int CANTALOUPE = 3; // 0x3 field public static final int CANTALOUPE = 3; // 0x3
field public static final int DRAGON_FRUIT = 4; // 0x4 field public static final int DRAGON_FRUIT = 4; // 0x4
field public static final int ELDERBERRY = 5; // 0x5 field public static final int ELDERBERRY = 5; // 0x5
field public static final int FIG = 6; // 0x6
} }
public final class Concierge { public final class Concierge {