Merge "GATT Server refactoring (3/4)" (cdff8a32) · Commits · e / os / android_packages_modules_Bluetooth

android/app/jni/com_android_bluetooth_gatt.cpp

+169 −214

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/gatt/ContextMap.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -320,7 +320,7 @@ import com.android.bluetooth.btservice.BluetoothProto;
		Iterator<Connection> i = mConnections.iterator();
		while (i.hasNext()) {
		Connection connection = i.next();
		if (connection.address.equals(address) && connection.appId == id)
		if (connection.address.equalsIgnoreCase(address) && connection.appId == id)
		return connection.connId;
		}
		return null;

android/app/src/com/android/bluetooth/gatt/GattDbElement.java

+39 −0

Original line number	Diff line number	Diff line
		@@ -50,4 +50,43 @@ public class GattDbElement {
		* the characteristic.
		*/
		public int properties;
		public int permissions;

		public static GattDbElement createPrimaryService(UUID uuid) {
		GattDbElement el = new GattDbElement();
		el.type = TYPE_PRIMARY_SERVICE;
		el.uuid = uuid;
		return el;
		}

		public static GattDbElement createSecondaryService(UUID uuid) {
		GattDbElement el = new GattDbElement();
		el.type = TYPE_SECONDARY_SERVICE;
		el.uuid = uuid;
		return el;
		}

		public static GattDbElement createCharacteristic(UUID uuid, int properties, int permissions) {
		GattDbElement el = new GattDbElement();
		el.type = TYPE_CHARACTERISTIC;
		el.uuid = uuid;
		el.properties = properties;
		el.permissions = permissions;
		return el;
		}

		public static GattDbElement createDescriptor(UUID uuid, int permissions) {
		GattDbElement el = new GattDbElement();
		el.type = TYPE_DESCRIPTOR;
		el.uuid = uuid;
		el.permissions = permissions;
		return el;
		}

		public static GattDbElement createIncludedService(int attributeHandle) {
		GattDbElement el = new GattDbElement();
		el.type = TYPE_INCLUDED_SERVICE;
		el.attributeHandle = attributeHandle;
		return el;
		}
		}

android/app/src/com/android/bluetooth/gatt/GattService.java

+127 −346

File changed.

Preview size limit exceeded, changes collapsed.

android/app/src/com/android/bluetooth/gatt/ServiceDeclaration.java

deleted100644 → 0

+0 −125

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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 com.android.bluetooth.gatt;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.UUID;

		class ServiceDeclaration {
		private static final boolean DBG = GattServiceConfig.DBG;
		private static final String TAG = GattServiceConfig.TAG_PREFIX + "ServiceDeclaration";

		public static final byte TYPE_UNDEFINED = 0;
		public static final byte TYPE_SERVICE = 1;
		public static final byte TYPE_CHARACTERISTIC = 2;
		public static final byte TYPE_DESCRIPTOR = 3;
		public static final byte TYPE_INCLUDED_SERVICE = 4;

		class Entry {
		byte type = TYPE_UNDEFINED;
		UUID uuid = null;
		int instance = 0;
		int permissions = 0;
		int properties = 0;
		int serviceType = 0;
		int serviceHandle = 0;
		boolean advertisePreferred = false;

		Entry(UUID uuid, int serviceType, int instance) {
		this.type = TYPE_SERVICE;
		this.uuid = uuid;
		this.instance = instance;
		this.serviceType = serviceType;
		}

		Entry(UUID uuid, int serviceType, int instance, boolean advertisePreferred) {
		this.type = TYPE_SERVICE;
		this.uuid = uuid;
		this.instance = instance;
		this.serviceType = serviceType;
		this.advertisePreferred = advertisePreferred;
		}

		Entry(UUID uuid, int properties, int permissions, int instance) {
		this.type = TYPE_CHARACTERISTIC;
		this.uuid = uuid;
		this.instance = instance;
		this.permissions = permissions;
		this.properties = properties;
		}

		Entry(UUID uuid, int permissions) {
		this.type = TYPE_DESCRIPTOR;
		this.uuid = uuid;
		this.permissions = permissions;
		}
		}

		List<Entry> mEntries = null;
		int mNumHandles = 0;

		ServiceDeclaration() {
		mEntries = new ArrayList<Entry>();
		}

		void addService(UUID uuid, int serviceType, int instance, int minHandles,
		boolean advertisePreferred) {
		mEntries.add(new Entry(uuid, serviceType, instance, advertisePreferred));
		if (minHandles == 0) {
		++mNumHandles;
		} else {
		mNumHandles = minHandles;
		}
		}

		void addIncludedService(UUID uuid, int serviceType, int instance) {
		Entry entry = new Entry(uuid, serviceType, instance);
		entry.type = TYPE_INCLUDED_SERVICE;
		mEntries.add(entry);
		++mNumHandles;
		}

		void addCharacteristic(UUID uuid, int properties, int permissions) {
		mEntries.add(new Entry(uuid, properties, permissions, 0 /instance/));
		mNumHandles += 2;
		}

		void addDescriptor(UUID uuid, int permissions) {
		mEntries.add(new Entry(uuid, permissions));
		++mNumHandles;
		}

		Entry getNext() {
		if (mEntries.isEmpty()) return null;
		Entry entry = mEntries.get(0);
		mEntries.remove(0);
		return entry;
		}

		boolean isServiceAdvertisePreferred(UUID uuid) {
		for (Entry entry : mEntries) {
		if (entry.uuid.equals(uuid)) {
		return entry.advertisePreferred;
		}
		}
		return false;
		}

		int getNumHandles() {
		return mNumHandles;
		}
		}