Move android.bluetooth.ParcelUuid to android.os.ParcelUuid
Change-Id: I564429d5c5b6a5372b6ff26a53b0d7e518b53631
This commit is contained in:
@ -216,6 +216,7 @@ aidl_files := \
|
||||
frameworks/base/core/java/android/net/Uri.aidl \
|
||||
frameworks/base/core/java/android/os/Bundle.aidl \
|
||||
frameworks/base/core/java/android/os/ParcelFileDescriptor.aidl \
|
||||
frameworks/base/core/java/android/os/ParcelUuid.aidl \
|
||||
frameworks/base/core/java/android/view/KeyEvent.aidl \
|
||||
frameworks/base/core/java/android/view/MotionEvent.aidl \
|
||||
frameworks/base/core/java/android/view/Surface.aidl \
|
||||
|
162
api/current.xml
162
api/current.xml
@ -27572,87 +27572,6 @@
|
||||
>
|
||||
</method>
|
||||
</class>
|
||||
<class name="ParcelUuid"
|
||||
extends="java.lang.Object"
|
||||
abstract="false"
|
||||
static="false"
|
||||
final="true"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<implements name="android.os.Parcelable">
|
||||
</implements>
|
||||
<constructor name="ParcelUuid"
|
||||
type="android.bluetooth.ParcelUuid"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="uuid" type="java.util.UUID">
|
||||
</parameter>
|
||||
</constructor>
|
||||
<method name="describeContents"
|
||||
return="int"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
</method>
|
||||
<method name="fromString"
|
||||
return="android.bluetooth.ParcelUuid"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="true"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="uuid" type="java.lang.String">
|
||||
</parameter>
|
||||
</method>
|
||||
<method name="getUuid"
|
||||
return="java.util.UUID"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
</method>
|
||||
<method name="writeToParcel"
|
||||
return="void"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="dest" type="android.os.Parcel">
|
||||
</parameter>
|
||||
<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>
|
||||
</package>
|
||||
<package name="android.content"
|
||||
>
|
||||
@ -105580,6 +105499,87 @@
|
||||
</parameter>
|
||||
</constructor>
|
||||
</class>
|
||||
<class name="ParcelUuid"
|
||||
extends="java.lang.Object"
|
||||
abstract="false"
|
||||
static="false"
|
||||
final="true"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<implements name="android.os.Parcelable">
|
||||
</implements>
|
||||
<constructor name="ParcelUuid"
|
||||
type="android.os.ParcelUuid"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="uuid" type="java.util.UUID">
|
||||
</parameter>
|
||||
</constructor>
|
||||
<method name="describeContents"
|
||||
return="int"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
</method>
|
||||
<method name="fromString"
|
||||
return="android.os.ParcelUuid"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="true"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="uuid" type="java.lang.String">
|
||||
</parameter>
|
||||
</method>
|
||||
<method name="getUuid"
|
||||
return="java.util.UUID"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
</method>
|
||||
<method name="writeToParcel"
|
||||
return="void"
|
||||
abstract="false"
|
||||
native="false"
|
||||
synchronized="false"
|
||||
static="false"
|
||||
final="false"
|
||||
deprecated="not deprecated"
|
||||
visibility="public"
|
||||
>
|
||||
<parameter name="dest" type="android.os.Parcel">
|
||||
</parameter>
|
||||
<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>
|
||||
<interface name="Parcelable"
|
||||
abstract="true"
|
||||
static="false"
|
||||
|
@ -18,6 +18,7 @@ package android.bluetooth;
|
||||
|
||||
import android.annotation.SdkConstant;
|
||||
import android.annotation.SdkConstant.SdkConstantType;
|
||||
import android.os.ParcelUuid;
|
||||
import android.os.RemoteException;
|
||||
import android.util.Log;
|
||||
|
||||
|
@ -22,6 +22,7 @@ import android.content.Context;
|
||||
import android.os.IBinder;
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
import android.os.ParcelUuid;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.util.Log;
|
||||
@ -228,9 +229,9 @@ public final class BluetoothDevice implements Parcelable {
|
||||
|
||||
/**
|
||||
* Broadcast Action: This intent is used to broadcast the {@link UUID}
|
||||
* wrapped as a {@link ParcelUuid} of the remote device after it has been
|
||||
* fetched. This intent is sent only when the UUIDs of the remote device
|
||||
* are requested to be fetched using Service Discovery Protocol
|
||||
* wrapped as a {@link android.os.ParcelUuid} of the remote device after it
|
||||
* has been fetched. This intent is sent only when the UUIDs of the remote
|
||||
* device are requested to be fetched using Service Discovery Protocol
|
||||
* <p> Always contains the extra field {@link #EXTRA_DEVICE}
|
||||
* <p> Always contains the extra filed {@link #EXTRA_UUID}
|
||||
* <p>Requires {@link android.Manifest.permission#BLUETOOTH} to receive.
|
||||
@ -309,8 +310,8 @@ public final class BluetoothDevice implements Parcelable {
|
||||
|
||||
/**
|
||||
* Used as an extra field in {@link #ACTION_UUID} intents,
|
||||
* Contains the {@link ParcelUuid}s of the remote device which is a parcelable
|
||||
* version of {@link UUID}.
|
||||
* Contains the {@link android.os.ParcelUuid}s of the remote device which
|
||||
* is a parcelable version of {@link UUID}.
|
||||
* @hide
|
||||
*/
|
||||
public static final String EXTRA_UUID = "android.bluetooth.device.extra.UUID";
|
||||
|
@ -16,6 +16,8 @@
|
||||
|
||||
package android.bluetooth;
|
||||
|
||||
import android.os.ParcelUuid;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.HashSet;
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
|
||||
package android.bluetooth;
|
||||
|
||||
import android.bluetooth.ParcelUuid;
|
||||
import android.os.ParcelUuid;
|
||||
|
||||
/**
|
||||
* System private API for talking with the Bluetooth service.
|
||||
|
@ -14,6 +14,6 @@
|
||||
** limitations under the License.
|
||||
*/
|
||||
|
||||
package android.bluetooth;
|
||||
package android.os;
|
||||
|
||||
parcelable ParcelUuid;
|
@ -14,10 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package android.bluetooth;
|
||||
|
||||
import android.os.Parcel;
|
||||
import android.os.Parcelable;
|
||||
package android.os;
|
||||
|
||||
import java.util.UUID;
|
||||
|
@ -27,7 +27,7 @@ import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.bluetooth.BluetoothUuid;
|
||||
import android.bluetooth.IBluetoothA2dp;
|
||||
import android.bluetooth.ParcelUuid;
|
||||
import android.os.ParcelUuid;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
|
@ -21,7 +21,7 @@ import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothClass;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.bluetooth.BluetoothUuid;
|
||||
import android.bluetooth.ParcelUuid;
|
||||
import android.os.ParcelUuid;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Handler;
|
||||
|
@ -30,7 +30,7 @@ import android.bluetooth.BluetoothDevice;
|
||||
import android.bluetooth.BluetoothHeadset;
|
||||
import android.bluetooth.BluetoothUuid;
|
||||
import android.bluetooth.IBluetooth;
|
||||
import android.bluetooth.ParcelUuid;
|
||||
import android.os.ParcelUuid;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.ContentResolver;
|
||||
import android.content.Context;
|
||||
|
Reference in New Issue
Block a user