summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Pelly <npelly@google.com>2009-09-16 16:50:11 -0700
committerNick Pelly <npelly@google.com>2009-09-17 08:25:30 -0700
commit074c11c1649a097ba1beae719069f8d4a2dd43e3 (patch)
treecd8be5c2c9b4fa1a2b6ef14a2857a6aac27daa72
parentff22b182a2b8aade96d32c65b9af96ccb91f6296 (diff)
downloadframeworks_base-074c11c1649a097ba1beae719069f8d4a2dd43e3.zip
frameworks_base-074c11c1649a097ba1beae719069f8d4a2dd43e3.tar.gz
frameworks_base-074c11c1649a097ba1beae719069f8d4a2dd43e3.tar.bz2
Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
Change-Id: I92389c53a9b99c9507f78898329ff87b631c7aa3
-rw-r--r--api/current.xml20
-rw-r--r--core/java/android/bluetooth/BluetoothClass.java3
-rw-r--r--core/java/android/bluetooth/BluetoothDevice.java3
3 files changed, 20 insertions, 6 deletions
diff --git a/api/current.xml b/api/current.xml
index 448da7c..2c9a087 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -26137,6 +26137,16 @@
<parameter name="flags" type="int">
</parameter>
</method>
+<field name="CREATOR"
+ type="android.os.Parcelable.Creator"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
</class>
<class name="BluetoothClass.Device"
extends="java.lang.Object"
@@ -27197,6 +27207,16 @@
visibility="public"
>
</field>
+<field name="CREATOR"
+ type="android.os.Parcelable.Creator"
+ transient="false"
+ volatile="false"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
<field name="ERROR"
type="int"
transient="false"
diff --git a/core/java/android/bluetooth/BluetoothClass.java b/core/java/android/bluetooth/BluetoothClass.java
index 1fbbf78..6210380 100644
--- a/core/java/android/bluetooth/BluetoothClass.java
+++ b/core/java/android/bluetooth/BluetoothClass.java
@@ -72,12 +72,10 @@ public final class BluetoothClass implements Parcelable {
return Integer.toHexString(mClass);
}
- /** @hide */
public int describeContents() {
return 0;
}
- /** @hide */
public static final Parcelable.Creator<BluetoothClass> CREATOR =
new Parcelable.Creator<BluetoothClass>() {
public BluetoothClass createFromParcel(Parcel in) {
@@ -88,7 +86,6 @@ public final class BluetoothClass implements Parcelable {
}
};
- /** @hide */
public void writeToParcel(Parcel out, int flags) {
out.writeInt(mClass);
}
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index 0b3f3c7..f81ba73 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -349,12 +349,10 @@ public final class BluetoothDevice implements Parcelable {
return mAddress;
}
- /** @hide */
public int describeContents() {
return 0;
}
- /** @hide */
public static final Parcelable.Creator<BluetoothDevice> CREATOR =
new Parcelable.Creator<BluetoothDevice>() {
public BluetoothDevice createFromParcel(Parcel in) {
@@ -365,7 +363,6 @@ public final class BluetoothDevice implements Parcelable {
}
};
- /** @hide */
public void writeToParcel(Parcel out, int flags) {
out.writeString(mAddress);
}