Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 074c11c1: Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.

Browse Source 
Merge commit '074c11c1649a097ba1beae719069f8d4a2dd43e3' into eclair-plus-aosp

* commit '074c11c1649a097ba1beae719069f8d4a2dd43e3':
  Do not @hide Parcelable implementations in BluetoothClass and BluetoothDevice.
This commit is contained in:
Nick Pelly
2009-09-17 08:53:07 -07:00
committed by Android Git Automerger
parent c165376408 074c11c164
commit 171318c2d1
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/current.xml
View File

@@ -26137,6 +26137,16 @@
<parameter name="flags" type="int"> <parameter name="flags" type="int">
</parameter> </parameter>
</method> </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>
<class name="BluetoothClass.Device" <class name="BluetoothClass.Device"
extends="java.lang.Object" extends="java.lang.Object"
@@ -27197,6 +27207,16 @@
visibility="public" visibility="public"
> >
</field> </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" <field name="ERROR"
type="int" type="int"
transient="false" transient="false"

3
core/java/android/bluetooth/BluetoothClass.java
View File

@@ -72,12 +72,10 @@ public final class BluetoothClass implements Parcelable {
return Integer.toHexString(mClass); return Integer.toHexString(mClass);
} }
/** @hide */
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
/** @hide */
public static final Parcelable.Creator<BluetoothClass> CREATOR = public static final Parcelable.Creator<BluetoothClass> CREATOR =
new Parcelable.Creator<BluetoothClass>() { new Parcelable.Creator<BluetoothClass>() {
public BluetoothClass createFromParcel(Parcel in) { public BluetoothClass createFromParcel(Parcel in) {
@@ -88,7 +86,6 @@ public final class BluetoothClass implements Parcelable {
} }
}; };
/** @hide */
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeInt(mClass); out.writeInt(mClass);
} }

3
core/java/android/bluetooth/BluetoothDevice.java
View File

@@ -349,12 +349,10 @@ public final class BluetoothDevice implements Parcelable {
return mAddress; return mAddress;
} }
/** @hide */
public int describeContents() { public int describeContents() {
return 0; return 0;
} }
/** @hide */
public static final Parcelable.Creator<BluetoothDevice> CREATOR = public static final Parcelable.Creator<BluetoothDevice> CREATOR =
new Parcelable.Creator<BluetoothDevice>() { new Parcelable.Creator<BluetoothDevice>() {
public BluetoothDevice createFromParcel(Parcel in) { public BluetoothDevice createFromParcel(Parcel in) {
@@ -365,7 +363,6 @@ public final class BluetoothDevice implements Parcelable {
} }
}; };
/** @hide */
public void writeToParcel(Parcel out, int flags) { public void writeToParcel(Parcel out, int flags) {
out.writeString(mAddress); out.writeString(mAddress);
} }