aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdnan Begovic <adnan@cyngn.com>2016-04-01 10:55:04 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2016-04-01 11:21:49 -0700
commitdf4486fb0eab595b9150aad47567b6f088efc976 (patch)
tree158f26958770cf0f6756e6622921b92abedc51ff
parentd549053b2df52f27e43c43c2dca939b5428c322e (diff)
downloadvendor_cmsdk-df4486fb0eab595b9150aad47567b6f088efc976.zip
vendor_cmsdk-df4486fb0eab595b9150aad47567b6f088efc976.tar.gz
vendor_cmsdk-df4486fb0eab595b9150aad47567b6f088efc976.tar.bz2
cmsdk: Unhide the Concierge.
Change-Id: I82adee7f9acb67623725acea723b52e08bab7311
-rw-r--r--api/cm_current.txt10
-rw-r--r--src/java/cyanogenmod/os/Concierge.java7
-rw-r--r--system-api/cm_system-current.txt10
3 files changed, 25 insertions, 2 deletions
diff --git a/api/cm_current.txt b/api/cm_current.txt
index 810935a..a987ec1 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -585,6 +585,16 @@ package cyanogenmod.os {
field public static final int ELDERBERRY = 5; // 0x5
}
+ public final class Concierge {
+ method public static cyanogenmod.os.Concierge.ParcelInfo prepareParcel(android.os.Parcel);
+ method public static cyanogenmod.os.Concierge.ParcelInfo receiveParcel(android.os.Parcel);
+ }
+
+ public static final class Concierge.ParcelInfo {
+ method public void complete();
+ method public int getParcelVersion();
+ }
+
}
package cyanogenmod.platform {
diff --git a/src/java/cyanogenmod/os/Concierge.java b/src/java/cyanogenmod/os/Concierge.java
index 5d86e82..2463dec 100644
--- a/src/java/cyanogenmod/os/Concierge.java
+++ b/src/java/cyanogenmod/os/Concierge.java
@@ -47,8 +47,6 @@ import cyanogenmod.os.Build.CM_VERSION_CODES;
* // Complete the process
* outgoingParcelInfo.complete();
* </pre>
- *
- * {@hide} // Unhide?
*/
public final class Concierge {
@@ -92,6 +90,11 @@ public final class Concierge {
return new ParcelInfo(parcel, PARCELABLE_VERSION);
}
+ /**
+ * Parcel header info specific to the Parcel object that is passed in via
+ * {@link #prepareParcel(Parcel)} or {@link #receiveParcel(Parcel)}. The exposed method
+ * of {@link #getParcelVersion()} gets the api level of the parcel object.
+ */
public final static class ParcelInfo {
private Parcel mParcel;
private int mParcelableVersion;
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index 810935a..a987ec1 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -585,6 +585,16 @@ package cyanogenmod.os {
field public static final int ELDERBERRY = 5; // 0x5
}
+ public final class Concierge {
+ method public static cyanogenmod.os.Concierge.ParcelInfo prepareParcel(android.os.Parcel);
+ method public static cyanogenmod.os.Concierge.ParcelInfo receiveParcel(android.os.Parcel);
+ }
+
+ public static final class Concierge.ParcelInfo {
+ method public void complete();
+ method public int getParcelVersion();
+ }
+
}
package cyanogenmod.platform {