Merge "Address API review comments. 1. Moved le stuff to it's subpackage.... (94fec83d) · Commits · e / os / android_frameworks_base

api/current.txt

+130 −143

Original line number	Original line	Diff line number	Diff line
	@@ -5566,8 +5566,8 @@ package android.bluetooth {
	method public boolean disable();		method public boolean disable();
	method public boolean enable();		method public boolean enable();
	method public java.lang.String getAddress();		method public java.lang.String getAddress();
	method public android.bluetooth.BluetoothLeAdvertiser getBluetoothLeAdvertiser();		method public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser();
	method public android.bluetooth.BluetoothLeScanner getBluetoothLeScanner();		method public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner();
	method public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();		method public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();
	method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();		method public static synchronized android.bluetooth.BluetoothAdapter getDefaultAdapter();
	method public java.lang.String getName();		method public java.lang.String getName();
	@@ -6210,74 +6210,71 @@ package android.bluetooth {
	method public void onHealthChannelStateChange(android.bluetooth.BluetoothHealthAppConfiguration, android.bluetooth.BluetoothDevice, int, int, android.os.ParcelFileDescriptor, int);		method public void onHealthChannelStateChange(android.bluetooth.BluetoothHealthAppConfiguration, android.bluetooth.BluetoothDevice, int, int, android.os.ParcelFileDescriptor, int);
	}		}

	public final class BluetoothLeAdvertiseScanData {		public final class BluetoothManager {
	ctor public BluetoothLeAdvertiseScanData();		method public android.bluetooth.BluetoothAdapter getAdapter();
	field public static final int ADVERTISING_DATA = 0; // 0x0		method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(int);
	field public static final int PARSED_SCAN_RECORD = 2; // 0x2		method public int getConnectionState(android.bluetooth.BluetoothDevice, int);
	field public static final int SCAN_RESPONSE_DATA = 1; // 0x1		method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int, int[]);
			method public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback);
	}		}

	public static abstract class BluetoothLeAdvertiseScanData.AdvertiseBaseData {		public abstract interface BluetoothProfile {
	method public int getDataType();		method public abstract java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
	method public int getManufacturerId();		method public abstract int getConnectionState(android.bluetooth.BluetoothDevice);
	method public byte[] getManufacturerSpecificData();		method public abstract java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
	method public byte[] getServiceData();		field public static final int A2DP = 2; // 0x2
	method public android.os.ParcelUuid getServiceDataUuid();		field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
	method public java.util.List<android.os.ParcelUuid> getServiceUuids();		field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
			field public static final int GATT = 7; // 0x7
			field public static final int GATT_SERVER = 8; // 0x8
			field public static final int HEADSET = 1; // 0x1
			field public static final int HEALTH = 3; // 0x3
			field public static final int STATE_CONNECTED = 2; // 0x2
			field public static final int STATE_CONNECTING = 1; // 0x1
			field public static final int STATE_DISCONNECTED = 0; // 0x0
			field public static final int STATE_DISCONNECTING = 3; // 0x3
	}		}

	public static final class BluetoothLeAdvertiseScanData.AdvertisementData extends android.bluetooth.BluetoothLeAdvertiseScanData.AdvertiseBaseData implements android.os.Parcelable {		public static abstract interface BluetoothProfile.ServiceListener {
	method public int describeContents();		method public abstract void onServiceConnected(int, android.bluetooth.BluetoothProfile);
	method public boolean getIncludeTxPowerLevel();		method public abstract void onServiceDisconnected(int);
	method public static android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder newBuilder();
	method public void writeToParcel(android.os.Parcel, int);
	field public static final android.os.Parcelable.Creator CREATOR;
	}		}

	public static final class BluetoothLeAdvertiseScanData.AdvertisementData.Builder {		public final class BluetoothServerSocket implements java.io.Closeable {
	ctor public BluetoothLeAdvertiseScanData.AdvertisementData.Builder();		method public android.bluetooth.BluetoothSocket accept() throws java.io.IOException;
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData build();		method public android.bluetooth.BluetoothSocket accept(int) throws java.io.IOException;
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder dataType(int);		method public void close() throws java.io.IOException;
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder includeTxPowerLevel(boolean);
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder manufacturerData(int, byte[]);
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder serviceData(android.os.ParcelUuid, byte[]);
	method public android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData.Builder serviceUuids(java.util.List<android.os.ParcelUuid>);
	}		}

	public static final class BluetoothLeAdvertiseScanData.ScanRecord extends android.bluetooth.BluetoothLeAdvertiseScanData.AdvertiseBaseData {		public final class BluetoothSocket implements java.io.Closeable {
	method public int getAdvertiseFlags();		method public void close() throws java.io.IOException;
	method public java.lang.String getLocalName();		method public void connect() throws java.io.IOException;
	method public static android.bluetooth.BluetoothLeAdvertiseScanData.ScanRecord.Parser getParser();		method public java.io.InputStream getInputStream() throws java.io.IOException;
	method public int getTxPowerLevel();		method public java.io.OutputStream getOutputStream() throws java.io.IOException;
			method public android.bluetooth.BluetoothDevice getRemoteDevice();
			method public boolean isConnected();
	}		}

	public static final class BluetoothLeAdvertiseScanData.ScanRecord.Parser {
	ctor public BluetoothLeAdvertiseScanData.ScanRecord.Parser();
	method public android.bluetooth.BluetoothLeAdvertiseScanData.ScanRecord parseFromScanRecord(byte[]);
	}		}

	public class BluetoothLeAdvertiser {		package android.bluetooth.le {
	method public void startAdvertising(android.bluetooth.BluetoothLeAdvertiser.Settings, android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData, android.bluetooth.BluetoothLeAdvertiser.AdvertiseCallback);
	method public void startAdvertising(android.bluetooth.BluetoothLeAdvertiser.Settings, android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData, android.bluetooth.BluetoothLeAdvertiseScanData.AdvertisementData, android.bluetooth.BluetoothLeAdvertiser.AdvertiseCallback);
	method public void stopAdvertising(android.bluetooth.BluetoothLeAdvertiser.Settings, android.bluetooth.BluetoothLeAdvertiser.AdvertiseCallback);
	}

	public static abstract interface BluetoothLeAdvertiser.AdvertiseCallback {		public abstract class AdvertiseCallback {
			ctor public AdvertiseCallback();
	method public abstract void onFailure(int);		method public abstract void onFailure(int);
	method public abstract void onSuccess(android.bluetooth.BluetoothLeAdvertiser.Settings);		method public abstract void onSuccess(android.bluetooth.le.AdvertiseSettings);
	field public static final int ADVERISING_NOT_STARTED = 4; // 0x4		field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
	field public static final int ADVERTISING_ALREADY_STARTED = 3; // 0x3		field public static final int ADVERTISE_FAILED_CONTROLLER_FAILURE = 5; // 0x5
	field public static final int ADVERTISING_SERVICE_UNKNOWN = 1; // 0x1		field public static final int ADVERTISE_FAILED_NOT_STARTED = 4; // 0x4
	field public static final int CONTROLLER_FAILURE = 5; // 0x5		field public static final int ADVERTISE_FAILED_SERVICE_UNKNOWN = 1; // 0x1
	field public static final int TOO_MANY_ADVERTISERS = 2; // 0x2		field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
	}		}

	public static final class BluetoothLeAdvertiser.Settings implements android.os.Parcelable {		public final class AdvertiseSettings implements android.os.Parcelable {
	method public int describeContents();		method public int describeContents();
	method public int getMode();		method public int getMode();
	method public int getTxPowerLevel();		method public int getTxPowerLevel();
	method public int getType();		method public int getType();
	method public static android.bluetooth.BluetoothLeAdvertiser.Settings.Builder newBuilder();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final int ADVERTISE_MODE_BALANCED = 1; // 0x1		field public static final int ADVERTISE_MODE_BALANCED = 1; // 0x1
	field public static final int ADVERTISE_MODE_LOW_LATENCY = 2; // 0x2		field public static final int ADVERTISE_MODE_LOW_LATENCY = 2; // 0x2
	@@ -6292,14 +6289,57 @@ package android.bluetooth {
	field public static final android.os.Parcelable.Creator CREATOR;		field public static final android.os.Parcelable.Creator CREATOR;
	}		}

	public static final class BluetoothLeAdvertiser.Settings.Builder {		public static final class AdvertiseSettings.Builder {
	method public android.bluetooth.BluetoothLeAdvertiser.Settings.Builder advertiseMode(int);		ctor public AdvertiseSettings.Builder();
	method public android.bluetooth.BluetoothLeAdvertiser.Settings build();		method public android.bluetooth.le.AdvertiseSettings build();
	method public android.bluetooth.BluetoothLeAdvertiser.Settings.Builder txPowerLevel(int);		method public android.bluetooth.le.AdvertiseSettings.Builder setAdvertiseMode(int);
	method public android.bluetooth.BluetoothLeAdvertiser.Settings.Builder type(int);		method public android.bluetooth.le.AdvertiseSettings.Builder setTxPowerLevel(int);
			method public android.bluetooth.le.AdvertiseSettings.Builder setType(int);
	}		}

	public final class BluetoothLeScanFilter implements android.os.Parcelable {		public final class AdvertisementData implements android.os.Parcelable {
			method public int describeContents();
			method public boolean getIncludeTxPowerLevel();
			method public int getManufacturerId();
			method public byte[] getManufacturerSpecificData();
			method public byte[] getServiceData();
			method public android.os.ParcelUuid getServiceDataUuid();
			method public java.util.List<android.os.ParcelUuid> getServiceUuids();
			method public void writeToParcel(android.os.Parcel, int);
			field public static final android.os.Parcelable.Creator CREATOR;
			}

			public static final class AdvertisementData.Builder {
			ctor public AdvertisementData.Builder();
			method public android.bluetooth.le.AdvertisementData build();
			method public android.bluetooth.le.AdvertisementData.Builder setIncludeTxPowerLevel(boolean);
			method public android.bluetooth.le.AdvertisementData.Builder setManufacturerData(int, byte[]);
			method public android.bluetooth.le.AdvertisementData.Builder setServiceData(android.os.ParcelUuid, byte[]);
			method public android.bluetooth.le.AdvertisementData.Builder setServiceUuids(java.util.List<android.os.ParcelUuid>);
			}

			public final class BluetoothLeAdvertiser {
			method public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertisementData, android.bluetooth.le.AdvertiseCallback);
			method public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertisementData, android.bluetooth.le.AdvertisementData, android.bluetooth.le.AdvertiseCallback);
			method public void stopAdvertising(android.bluetooth.le.AdvertiseCallback);
			}

			public final class BluetoothLeScanner {
			method public void startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
			method public void stopScan(android.bluetooth.le.ScanCallback);
			}

			public abstract class ScanCallback {
			ctor public ScanCallback();
			method public abstract void onAdvertisementUpdate(android.bluetooth.le.ScanResult);
			method public abstract void onScanFailed(int);
			field public static final int SCAN_FAILED_ALREADY_STARTED = 1; // 0x1
			field public static final int SCAN_FAILED_APPLICATION_REGISTRATION_FAILED = 2; // 0x2
			field public static final int SCAN_FAILED_CONTROLLER_FAILURE = 4; // 0x4
			field public static final int SCAN_FAILED_GATT_SERVICE_FAILURE = 3; // 0x3
			}

			public final class ScanFilter implements android.os.Parcelable {
	method public int describeContents();		method public int describeContents();
	method public java.lang.String getDeviceAddress();		method public java.lang.String getDeviceAddress();
	method public java.lang.String getLocalName();		method public java.lang.String getLocalName();
	@@ -6312,63 +6352,54 @@ package android.bluetooth {
	method public byte[] getServiceDataMask();		method public byte[] getServiceDataMask();
	method public android.os.ParcelUuid getServiceUuid();		method public android.os.ParcelUuid getServiceUuid();
	method public android.os.ParcelUuid getServiceUuidMask();		method public android.os.ParcelUuid getServiceUuidMask();
	method public boolean matches(android.bluetooth.BluetoothLeScanner.ScanResult);		method public boolean matches(android.bluetooth.le.ScanResult);
	method public static android.bluetooth.BluetoothLeScanFilter.Builder newBuilder();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final android.os.Parcelable.Creator CREATOR;		field public static final android.os.Parcelable.Creator CREATOR;
	}		}

	public static class BluetoothLeScanFilter.Builder {		public static final class ScanFilter.Builder {
	method public android.bluetooth.BluetoothLeScanFilter build();		ctor public ScanFilter.Builder();
	method public android.bluetooth.BluetoothLeScanFilter.Builder macAddress(java.lang.String);		method public android.bluetooth.le.ScanFilter build();
	method public android.bluetooth.BluetoothLeScanFilter.Builder manufacturerData(int, byte[]);		method public android.bluetooth.le.ScanFilter.Builder setMacAddress(java.lang.String);
	method public android.bluetooth.BluetoothLeScanFilter.Builder manufacturerDataMask(byte[]);		method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[]);
	method public android.bluetooth.BluetoothLeScanFilter.Builder name(java.lang.String);		method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);
	method public android.bluetooth.BluetoothLeScanFilter.Builder rssiRange(int, int);		method public android.bluetooth.le.ScanFilter.Builder setName(java.lang.String);
	method public android.bluetooth.BluetoothLeScanFilter.Builder serviceData(byte[]);		method public android.bluetooth.le.ScanFilter.Builder setRssiRange(int, int);
	method public android.bluetooth.BluetoothLeScanFilter.Builder serviceDataMask(byte[]);		method public android.bluetooth.le.ScanFilter.Builder setServiceData(byte[]);
	method public android.bluetooth.BluetoothLeScanFilter.Builder serviceUuid(android.os.ParcelUuid);		method public android.bluetooth.le.ScanFilter.Builder setServiceData(byte[], byte[]);
	method public android.bluetooth.BluetoothLeScanFilter.Builder serviceUuidMask(android.os.ParcelUuid);		method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);
	}		method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);

	public class BluetoothLeScanner {
	method public void startScan(java.util.List<android.bluetooth.BluetoothLeScanFilter>, android.bluetooth.BluetoothLeScanner.Settings, android.bluetooth.BluetoothLeScanner.ScanCallback);
	method public void stopScan(android.bluetooth.BluetoothLeScanner.Settings);
	}		}

	public static abstract interface BluetoothLeScanner.ScanCallback {		public final class ScanRecord {
	method public abstract void onBatchScanResults(java.util.List<android.bluetooth.BluetoothLeScanner.ScanResult>);		method public int getAdvertiseFlags();
	method public abstract void onDeviceFound(android.bluetooth.BluetoothLeScanner.ScanResult);		method public java.lang.String getLocalName();
	method public abstract void onDeviceLost(android.bluetooth.BluetoothDevice);		method public int getManufacturerId();
	method public abstract void onDeviceUpdate(android.bluetooth.BluetoothLeScanner.ScanResult);		method public byte[] getManufacturerSpecificData();
	method public abstract void onScanFailed(int);		method public byte[] getServiceData();
	field public static final int APPLICATION_REGISTRATION_FAILED = 2; // 0x2		method public android.os.ParcelUuid getServiceDataUuid();
	field public static final int CONTROLLER_FAILURE = 4; // 0x4		method public java.util.List<android.os.ParcelUuid> getServiceUuids();
	field public static final int GATT_SERVICE_FAILURE = 3; // 0x3		method public int getTxPowerLevel();
	field public static final int SCAN_ALREADY_STARTED = 1; // 0x1		method public static android.bluetooth.le.ScanRecord parseFromBytes(byte[]);
	}		}

	public static final class BluetoothLeScanner.ScanResult implements android.os.Parcelable {		public final class ScanResult implements android.os.Parcelable {
	ctor public BluetoothLeScanner.ScanResult(android.bluetooth.BluetoothDevice, byte[], int, long);
	method public int describeContents();		method public int describeContents();
	method public android.bluetooth.BluetoothDevice getDevice();		method public android.bluetooth.BluetoothDevice getDevice();
	method public int getRssi();		method public int getRssi();
	method public byte[] getScanRecord();		method public byte[] getScanRecord();
	method public long getTimestampMicros();		method public long getTimestampNanos();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final android.os.Parcelable.Creator CREATOR;		field public static final android.os.Parcelable.Creator CREATOR;
	}		}

	public static final class BluetoothLeScanner.Settings implements android.os.Parcelable {		public final class ScanSettings implements android.os.Parcelable {
	method public int describeContents();		method public int describeContents();
	method public int getCallbackType();		method public int getCallbackType();
	method public long getReportDelayMicros();		method public long getReportDelayNanos();
	method public int getScanMode();		method public int getScanMode();
	method public int getScanResultType();		method public int getScanResultType();
	method public static android.bluetooth.BluetoothLeScanner.Settings.Builder newBuilder();
	method public void writeToParcel(android.os.Parcel, int);		method public void writeToParcel(android.os.Parcel, int);
	field public static final int CALLBACK_TYPE_ON_FOUND = 1; // 0x1
	field public static final int CALLBACK_TYPE_ON_LOST = 2; // 0x2
	field public static final int CALLBACK_TYPE_ON_UPDATE = 0; // 0x0		field public static final int CALLBACK_TYPE_ON_UPDATE = 0; // 0x0
	field public static final android.os.Parcelable.Creator CREATOR;		field public static final android.os.Parcelable.Creator CREATOR;
	field public static final int SCAN_MODE_BALANCED = 1; // 0x1		field public static final int SCAN_MODE_BALANCED = 1; // 0x1
	@@ -6377,56 +6408,12 @@ package android.bluetooth {
	field public static final int SCAN_RESULT_TYPE_FULL = 0; // 0x0		field public static final int SCAN_RESULT_TYPE_FULL = 0; // 0x0
	}		}

	public static class BluetoothLeScanner.Settings.Builder {		public static final class ScanSettings.Builder {
	method public android.bluetooth.BluetoothLeScanner.Settings build();		ctor public ScanSettings.Builder();
	method public android.bluetooth.BluetoothLeScanner.Settings.Builder callbackType(int);		method public android.bluetooth.le.ScanSettings build();
	method public android.bluetooth.BluetoothLeScanner.Settings.Builder reportDelayMicros(long);		method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int);
	method public android.bluetooth.BluetoothLeScanner.Settings.Builder scanMode(int);		method public android.bluetooth.le.ScanSettings.Builder setReportDelayNanos(long);
	}		method public android.bluetooth.le.ScanSettings.Builder setScanMode(int);

	public final class BluetoothManager {
	method public android.bluetooth.BluetoothAdapter getAdapter();
	method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(int);
	method public int getConnectionState(android.bluetooth.BluetoothDevice, int);
	method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int, int[]);
	method public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback);
	}

	public abstract interface BluetoothProfile {
	method public abstract java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
	method public abstract int getConnectionState(android.bluetooth.BluetoothDevice);
	method public abstract java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
	field public static final int A2DP = 2; // 0x2
	field public static final java.lang.String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
	field public static final java.lang.String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
	field public static final int GATT = 7; // 0x7
	field public static final int GATT_SERVER = 8; // 0x8
	field public static final int HEADSET = 1; // 0x1
	field public static final int HEALTH = 3; // 0x3
	field public static final int STATE_CONNECTED = 2; // 0x2
	field public static final int STATE_CONNECTING = 1; // 0x1
	field public static final int STATE_DISCONNECTED = 0; // 0x0
	field public static final int STATE_DISCONNECTING = 3; // 0x3
	}

	public static abstract interface BluetoothProfile.ServiceListener {
	method public abstract void onServiceConnected(int, android.bluetooth.BluetoothProfile);
	method public abstract void onServiceDisconnected(int);
	}

	public final class BluetoothServerSocket implements java.io.Closeable {
	method public android.bluetooth.BluetoothSocket accept() throws java.io.IOException;
	method public android.bluetooth.BluetoothSocket accept(int) throws java.io.IOException;
	method public void close() throws java.io.IOException;
	}

	public final class BluetoothSocket implements java.io.Closeable {
	method public void close() throws java.io.IOException;
	method public void connect() throws java.io.IOException;
	method public java.io.InputStream getInputStream() throws java.io.IOException;
	method public java.io.OutputStream getOutputStream() throws java.io.IOException;
	method public android.bluetooth.BluetoothDevice getRemoteDevice();
	method public boolean isConnected();
	}		}

	}		}

core/java/android/bluetooth/BluetoothAdapter.java

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,8 @@ package android.bluetooth;

	import android.annotation.SdkConstant;		import android.annotation.SdkConstant;
	import android.annotation.SdkConstant.SdkConstantType;		import android.annotation.SdkConstant.SdkConstantType;
			import android.bluetooth.le.BluetoothLeAdvertiser;
			import android.bluetooth.le.BluetoothLeScanner;
	import android.content.Context;		import android.content.Context;
	import android.os.Handler;		import android.os.Handler;
	import android.os.IBinder;		import android.os.IBinder;

core/java/android/bluetooth/BluetoothLeAdvertiseScanData.java

deleted100644 → 0

+0 −645

File deleted.

Preview size limit exceeded, changes collapsed.

core/java/android/bluetooth/IBluetoothGatt.aidl

+8 −9

Original line number	Original line	Diff line number	Diff line
	@@ -17,10 +17,10 @@
	package android.bluetooth;		package android.bluetooth;

	import android.bluetooth.BluetoothDevice;		import android.bluetooth.BluetoothDevice;
	import android.bluetooth.BluetoothLeAdvertiseScanData;		import android.bluetooth.le.AdvertiseSettings;
	import android.bluetooth.BluetoothLeAdvertiser;		import android.bluetooth.le.AdvertisementData;
	import android.bluetooth.BluetoothLeScanFilter;		import android.bluetooth.le.ScanFilter;
	import android.bluetooth.BluetoothLeScanner;		import android.bluetooth.le.ScanSettings;
	import android.os.ParcelUuid;		import android.os.ParcelUuid;

	import android.bluetooth.IBluetoothGattCallback;		import android.bluetooth.IBluetoothGattCallback;
	@@ -38,13 +38,12 @@ interface IBluetoothGatt {
	void startScanWithUuidsScanParam(in int appIf, in boolean isServer,		void startScanWithUuidsScanParam(in int appIf, in boolean isServer,
	in ParcelUuid[] ids, int scanWindow, int scanInterval);		in ParcelUuid[] ids, int scanWindow, int scanInterval);
	void startScanWithFilters(in int appIf, in boolean isServer,		void startScanWithFilters(in int appIf, in boolean isServer,
	in BluetoothLeScanner.Settings settings,		in ScanSettings settings, in List<ScanFilter> filters);
	in List<BluetoothLeScanFilter> filters);
	void stopScan(in int appIf, in boolean isServer);		void stopScan(in int appIf, in boolean isServer);
	void startMultiAdvertising(in int appIf,		void startMultiAdvertising(in int appIf,
	in BluetoothLeAdvertiseScanData.AdvertisementData advertiseData,		in AdvertisementData advertiseData,
	in BluetoothLeAdvertiseScanData.AdvertisementData scanResponse,		in AdvertisementData scanResponse,
	in BluetoothLeAdvertiser.Settings settings);		in AdvertiseSettings settings);
	void stopMultiAdvertising(in int appIf);		void stopMultiAdvertising(in int appIf);
	void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback);		void registerClient(in ParcelUuid appId, in IBluetoothGattCallback callback);
	void unregisterClient(in int clientIf);		void unregisterClient(in int clientIf);

core/java/android/bluetooth/le/AdvertiseCallback.java

0 → 100644

+68 −0

File added.

Preview size limit exceeded, changes collapsed.