diff --git a/Android.mk b/Android.mk index 4eb91d5..23ef0a5 100644 --- a/Android.mk +++ b/Android.mk @@ -202,7 +202,7 @@ cmplat_docs_java_libraries := \ cmplat_docs_SDK_VERSION := 13.0 # release version -cmplat_docs_SDK_REL_ID := 5 +cmplat_docs_SDK_REL_ID := 6 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)/3.txt 3 \ -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) include $(BUILD_DROIDDOC) diff --git a/api/cm_current.txt b/api/cm_current.txt index 223d7f4..9d8a981 100644 --- a/api/cm_current.txt +++ b/api/cm_current.txt @@ -583,6 +583,7 @@ package cyanogenmod.os { field public static final int CANTALOUPE = 3; // 0x3 field public static final int DRAGON_FRUIT = 4; // 0x4 field public static final int ELDERBERRY = 5; // 0x5 + field public static final int FIG = 6; // 0x6 } public final class Concierge { diff --git a/sdk/src/java/cyanogenmod/os/Build.java b/sdk/src/java/cyanogenmod/os/Build.java index 6d7c8c0..e758413 100644 --- a/sdk/src/java/cyanogenmod/os/Build.java +++ b/sdk/src/java/cyanogenmod/os/Build.java @@ -42,6 +42,7 @@ public class Build { sdkMap.put(CM_VERSION_CODES.CANTALOUPE, "Cantaloupe"); sdkMap.put(CM_VERSION_CODES.DRAGON_FRUIT, "Dragon Fruit"); sdkMap.put(CM_VERSION_CODES.ELDERBERRY, "Elderberry"); + sdkMap.put(CM_VERSION_CODES.FIG, "Fig"); } /** Various version strings. */ @@ -148,6 +149,11 @@ public class Build { * */ public static final int ELDERBERRY = 5; + + /** + * Future Release - 3rd quarter 2016 + */ + public static final int FIG = 6; } /** diff --git a/sdk/src/java/cyanogenmod/os/Concierge.java b/sdk/src/java/cyanogenmod/os/Concierge.java index 2463dec..f53018e 100644 --- a/sdk/src/java/cyanogenmod/os/Concierge.java +++ b/sdk/src/java/cyanogenmod/os/Concierge.java @@ -64,7 +64,7 @@ public final class Concierge { * {@link CM_VERSION_CODES} * @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. diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt index 223d7f4..9d8a981 100644 --- a/system-api/cm_system-current.txt +++ b/system-api/cm_system-current.txt @@ -583,6 +583,7 @@ package cyanogenmod.os { field public static final int CANTALOUPE = 3; // 0x3 field public static final int DRAGON_FRUIT = 4; // 0x4 field public static final int ELDERBERRY = 5; // 0x5 + field public static final int FIG = 6; // 0x6 } public final class Concierge {