cmsdk: Introduce API level 7 - Guava

Change-Id: I9fda50cc46d15e4f89a29303be18c8947befc3e1

Android.mk

@@ -199,10 +199,10 @@ cmplat_docs_java_libraries := \
     org.cyanogenmod.platform.sdk
 
 # SDK version as defined
-cmplat_docs_SDK_VERSION := 13.0
+cmplat_docs_SDK_VERSION := 14.0
 
 # release version
-cmplat_docs_SDK_REL_ID := 6
+cmplat_docs_SDK_REL_ID := 7
 
 cmplat_docs_LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
@@ -278,7 +278,8 @@ LOCAL_DROIDDOC_OPTIONS := \
         -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)/6.txt 6
+        -since $(CM_SRC_API_DIR)/6.txt 6 \
+        -since $(CM_SRC_API_DIR)/7.txt 7
 
 $(full_target): $(cm_framework_built) $(gen)
 include $(BUILD_DROIDDOC)

api/cm_current.txt

@@ -674,6 +674,7 @@ package cyanogenmod.os {
     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
+    field public static final int GUAVA = 7; // 0x7
   }
 
   public final class Concierge {

sdk/src/java/cyanogenmod/os/Build.java

@@ -43,6 +43,7 @@ public class Build {
         sdkMap.put(CM_VERSION_CODES.DRAGON_FRUIT, "Dragon Fruit");
         sdkMap.put(CM_VERSION_CODES.ELDERBERRY, "Elderberry");
         sdkMap.put(CM_VERSION_CODES.FIG, "Fig");
+        sdkMap.put(CM_VERSION_CODES.GUAVA, "Guava");
     }
 
     /** Various version strings. */
@@ -169,6 +170,11 @@ public class Build {
          * Signing out, Adnan \u270C
          */
         public static final int FIG = 6;
+
+        /**
+         * Unreleased preliminary version starting from CM14
+         */
+        public static final int GUAVA = 7;
     }
 
     /**

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.FIG;
+    public static final int PARCELABLE_VERSION = CM_VERSION_CODES.GUAVA;
 
     /**
      * Tell the concierge to receive our parcel, so we can get information from it.