diff options
author | Casper Bonde <c.bonde@samsung.com> | 2015-04-17 11:46:49 +0200 |
---|---|---|
committer | Andre Eisenbach <eisenbach@google.com> | 2015-06-02 22:23:43 -0700 |
commit | a49b4e45faf378e3848c4f6eb468e0a14565aa6c (patch) | |
tree | c883bdcf9069da49f2b420f08debfdbd8e4a8741 /tests | |
parent | bbb071e6d73df46230ec654e3066a46f6e35a88d (diff) | |
download | android_packages_apps_Bluetooth-a49b4e45faf378e3848c4f6eb468e0a14565aa6c.tar.gz android_packages_apps_Bluetooth-a49b4e45faf378e3848c4f6eb468e0a14565aa6c.tar.bz2 android_packages_apps_Bluetooth-a49b4e45faf378e3848c4f6eb468e0a14565aa6c.zip |
SAP: Fix exception at shutdown
Restructures the disconnect/shutdown code, to avoid exception.
Also ensure cleanup of notifications and profile public state.
This also fixes the bug introduced when handling ACL_disconnect
intent, where the rfcomm-listener was not restarted.
Change-Id: I3b4561f610abc77011689b7cfb67a4b54c41500c
Signed-off-by: Casper Bonde <c.bonde@samsung.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/bluetooth/tests/SecurityTest.java | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/tests/src/com/android/bluetooth/tests/SecurityTest.java b/tests/src/com/android/bluetooth/tests/SecurityTest.java index e95020175..39d9f589d 100644 --- a/tests/src/com/android/bluetooth/tests/SecurityTest.java +++ b/tests/src/com/android/bluetooth/tests/SecurityTest.java @@ -2,6 +2,7 @@ package com.android.bluetooth.tests; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; +import android.bluetooth.BluetoothSocket; import android.bluetooth.BluetoothUuid; import android.test.AndroidTestCase; import android.util.Log; @@ -13,23 +14,34 @@ public class SecurityTest extends AndroidTestCase { public void connectSapNoSec() { BluetoothAdapter bt = BluetoothAdapter.getDefaultAdapter(); - if(bt == null) { + if (bt == null) { Log.e(TAG,"No Bluetooth Device!"); assertTrue(false); } BluetoothTestUtils.enableBt(bt); + Log.i(TAG,"BT Enabled"); BluetoothDevice serverDevice = bt.getRemoteDevice(ObexTest.SERVER_ADDRESS); - try { - serverDevice.createInsecureRfcommSocketToServiceRecord(BluetoothUuid.SAP.getUuid()); - } catch (IOException e) { - Log.e(TAG, "Failed to create connection", e); - } + Log.i(TAG,"ServerDevice: " + serverDevice); try { - Thread.sleep(1000); + BluetoothSocket socket = + serverDevice.createInsecureRfcommSocketToServiceRecord(BluetoothUuid.SAP.getUuid()); + Log.i(TAG,"createInsecureRfcommSocketToServiceRecord() - waiting for connect..."); + socket.connect(); + Log.i(TAG,"Connected!"); + Thread.sleep(5000); + Log.i(TAG,"Closing..."); + socket.close(); + Log.i(TAG,"Closed!"); + } catch (InterruptedException e) { Log.w(TAG, "Sleep interrupted", e); + fail(); + + } catch (IOException e) { + Log.e(TAG, "Failed to create connection", e); + fail(); } } } |