From b83748df518af2ad5e162b526701ff7d58d02757 Mon Sep 17 00:00:00 2001 From: "jihwan.seo" Date: Mon, 20 Jul 2015 12:59:44 +0900 Subject: [PATCH] remove unnecessary codes in callback for android I have updated callback codes into the code of android_api. Change-Id: Idcf5015d24aa9e263b16dfe42d4f596efd7e7b2e Signed-off-by: jihwan.seo Reviewed-on: https://gerrit.iotivity.org/gerrit/1746 Tested-by: jenkins-iotivity Reviewed-by: Erich Keane --- .../src/main/java/org/iotivity/ca/CaLeClientInterface.java | 7 ++++--- .../src/main/java/org/iotivity/ca/CaLeServerInterface.java | 14 -------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java b/android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java index ddeeb48..891cb40 100644 --- a/android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java +++ b/android/android_api/base/src/main/java/org/iotivity/ca/CaLeClientInterface.java @@ -41,6 +41,7 @@ import android.util.Log; public class CaLeClientInterface { private static String SERVICE_UUID = "ADE3D529-C784-4F63-A987-EB69F70EE816"; + private static String TAG = "Sample_Service : CaLeClientInterface"; private CaLeClientInterface(Context context) { @@ -121,9 +122,9 @@ public class CaLeClientInterface { try { List uuids = getUuids(scanRecord); for (UUID uuid : uuids) { - Log.d("CA", "UUID : " + uuid.toString()); + Log.d(TAG, "UUID : " + uuid.toString()); if(uuid.toString().contains(SERVICE_UUID.toLowerCase())) { - Log.d("CA", "we found that has the Device"); + Log.d(TAG, "we found that has the Device"); caLeScanCallback(device, rssi, scanRecord); } } @@ -165,7 +166,7 @@ public class CaLeClientInterface { long leastSigBits = buffer.getLong(); uuids.add(new UUID(leastSigBits, mostSigBits)); } catch (IndexOutOfBoundsException e) { - Log.e("CA", e.toString()); + Log.e(TAG, e.toString()); continue; } finally { offset += 15; diff --git a/android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java b/android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java index 3cbf0f2..18ac49f 100644 --- a/android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java +++ b/android/android_api/base/src/main/java/org/iotivity/ca/CaLeServerInterface.java @@ -20,27 +20,13 @@ package org.iotivity.ca; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; - -import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; -import android.bluetooth.BluetoothGatt; -import android.bluetooth.BluetoothGattCallback; import android.bluetooth.BluetoothGattCharacteristic; import android.bluetooth.BluetoothGattDescriptor; import android.bluetooth.BluetoothGattServerCallback; import android.bluetooth.BluetoothGattService; import android.bluetooth.le.AdvertiseCallback; import android.bluetooth.le.AdvertiseSettings; -import android.content.BroadcastReceiver; -import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; -import android.util.Log; public class CaLeServerInterface { -- 2.7.4