Merge "Separate LE scanner from GATT client (1/4)" am: 87c997ca21 am: 81d5ecb7a6 (e582ab85) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ LOCAL_SRC_FILES += \
		core/java/android/bluetooth/IBluetoothGattCallback.aidl \
		core/java/android/bluetooth/IBluetoothGattServerCallback.aidl \
		core/java/android/bluetooth/le/IAdvertiserCallback.aidl \
		core/java/android/bluetooth/le/IScannerCallback.aidl \
		core/java/android/content/IClipboard.aidl \
		core/java/android/content/IContentService.aidl \
		core/java/android/content/IIntentReceiver.aidl \

core/java/android/bluetooth/BluetoothGatt.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -135,7 +135,7 @@ public final class BluetoothGatt implements BluetoothProfile {
		* Bluetooth GATT callbacks. Overrides the default BluetoothGattCallback implementation.
		*/
		private final IBluetoothGattCallback mBluetoothGattCallback =
		new BluetoothGattCallbackWrapper() {
		new IBluetoothGattCallback.Stub() {
		/**
		* Application interface registered - app is ready to go
		* @hide

core/java/android/bluetooth/BluetoothGattCallbackWrapper.java

deleted100644 → 0

+0 −96

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.bluetooth;

		import android.bluetooth.le.AdvertiseSettings;
		import android.bluetooth.le.ScanResult;
		import android.bluetooth.BluetoothGattService;
		import android.os.ParcelUuid;
		import android.os.RemoteException;

		import java.util.List;

		/**
		* Wrapper class for default implementation of IBluetoothGattCallback.
		*
		* @hide
		*/
		public class BluetoothGattCallbackWrapper extends IBluetoothGattCallback.Stub {

		@Override
		public void onClientRegistered(int status, int clientIf) throws RemoteException {
		}

		@Override
		public void onClientConnectionState(int status, int clientIf, boolean connected, String address)
		throws RemoteException {
		}

		@Override
		public void onScanResult(ScanResult scanResult) throws RemoteException {
		}

		@Override
		public void onBatchScanResults(List<ScanResult> batchResults) throws RemoteException {
		}

		@Override
		public void onSearchComplete(String address, List<BluetoothGattService> services,
		int status) throws RemoteException {
		}

		@Override
		public void onCharacteristicRead(String address, int status, int handle, byte[] value)
		throws RemoteException {
		}

		@Override
		public void onCharacteristicWrite(String address, int status, int handle) throws RemoteException {
		}

		@Override
		public void onExecuteWrite(String address, int status) throws RemoteException {
		}

		@Override
		public void onDescriptorRead(String address, int status, int handle, byte[] value) throws RemoteException {
		}

		@Override
		public void onDescriptorWrite(String address, int status, int handle) throws RemoteException {
		}

		@Override
		public void onNotify(String address, int handle, byte[] value) throws RemoteException {
		}

		@Override
		public void onReadRemoteRssi(String address, int rssi, int status) throws RemoteException {
		}

		@Override
		public void onConfigureMTU(String address, int mtu, int status) throws RemoteException {
		}

		@Override
		public void onFoundOrLost(boolean onFound, ScanResult scanResult) throws RemoteException {
		}

		@Override
		public void onScanManagerErrorCallback(int errorCode) throws RemoteException {
		}
		}

core/java/android/bluetooth/IBluetoothGatt.aidl

+7 −5

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ import android.os.WorkSource;
		import android.bluetooth.IBluetoothGattCallback;
		import android.bluetooth.IBluetoothGattServerCallback;
		import android.bluetooth.le.IAdvertiserCallback;
		import android.bluetooth.le.IScannerCallback;

		/**
		* API for interacting with BLE / GATT
		@@ -37,11 +38,12 @@ import android.bluetooth.le.IAdvertiserCallback;
		interface IBluetoothGatt {
		List<BluetoothDevice> getDevicesMatchingConnectionStates(in int[] states);

		void startScan(in int appIf, in boolean isServer, in ScanSettings settings,
		in List<ScanFilter> filters, in WorkSource workSource, in List scanStorages,
		in String callingPackage);
		void stopScan(in int appIf, in boolean isServer);
		void flushPendingBatchResults(in int appIf, in boolean isServer);
		void registerScanner(in IScannerCallback callback);
		void unregisterScanner(in int scannerId);
		void startScan(in int scannerId, in ScanSettings settings, in List<ScanFilter> filters,
		in WorkSource workSource, in List scanStorages, in String callingPackage);
		void stopScan(in int scannerId);
		void flushPendingBatchResults(in int scannerId);

		void registerAdvertiser(in IAdvertiserCallback callback);
		void unregisterAdvertiser(in int advertiserId);

core/java/android/bluetooth/IBluetoothGattCallback.aidl

+0 −6

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

		import android.os.ParcelUuid;
		import android.bluetooth.BluetoothGattService;
		import android.bluetooth.le.AdvertiseSettings;
		import android.bluetooth.le.ScanResult;

		/**
		* Callback definitions for interacting with BLE / GATT
		@@ -28,8 +26,6 @@ oneway interface IBluetoothGattCallback {
		void onClientRegistered(in int status, in int clientIf);
		void onClientConnectionState(in int status, in int clientIf,
		in boolean connected, in String address);
		void onScanResult(in ScanResult scanResult);
		void onBatchScanResults(in List<ScanResult> batchResults);
		void onSearchComplete(in String address, in List<BluetoothGattService> services, in int status);
		void onCharacteristicRead(in String address, in int status, in int handle, in byte[] value);
		void onCharacteristicWrite(in String address, in int status, in int handle);
		@@ -38,7 +34,5 @@ oneway interface IBluetoothGattCallback {
		void onDescriptorWrite(in String address, in int status, in int handle);
		void onNotify(in String address, in int handle, in byte[] value);
		void onReadRemoteRssi(in String address, in int rssi, in int status);
		void onScanManagerErrorCallback(in int errorCode);
		void onConfigureMTU(in String address, in int mtu, in int status);
		void onFoundOrLost(in boolean onFound, in ScanResult scanResult);
		}