diff options
| author | Kiran Kelageri <kirankelageri@codeaurora.org> | 2015-08-04 15:22:36 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:25:40 -0600 |
| commit | 6d58ab27c66e1343f11118fc0f371a582cfe21f8 (patch) | |
| tree | d445553a50a7646be4885bf3b8c4e7cbf5a4e6d3 /src/com/android/bluetooth/btservice | |
| parent | 48723f88131eae7ed8f9d9465cd45651558059ce (diff) | |
| download | android_packages_apps_Bluetooth-6d58ab27c66e1343f11118fc0f371a582cfe21f8.tar.gz android_packages_apps_Bluetooth-6d58ab27c66e1343f11118fc0f371a582cfe21f8.tar.bz2 android_packages_apps_Bluetooth-6d58ab27c66e1343f11118fc0f371a582cfe21f8.zip | |
Bluetooth: Enable SSR.
Enabling SSR feature.
Change-Id: I142de8bab73108cefd00d6389eddf6eece7c0c58
Diffstat (limited to 'src/com/android/bluetooth/btservice')
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterService.java | 1 | ||||
| -rw-r--r-- | src/com/android/bluetooth/btservice/AdapterState.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/bluetooth/btservice/AdapterService.java b/src/com/android/bluetooth/btservice/AdapterService.java index 94a590dff..5aca10dd3 100644 --- a/src/com/android/bluetooth/btservice/AdapterService.java +++ b/src/com/android/bluetooth/btservice/AdapterService.java @@ -2325,6 +2325,7 @@ public class AdapterService extends Service { private native static void classInitNative(); private native boolean initNative(); private native void cleanupNative(); + /*package*/ native void ssrcleanupNative(boolean cleanup); /*package*/ native boolean enableNative(); /*package*/ native boolean disableNative(); /*package*/ native boolean setAdapterPropertyNative(int type, byte[] val); diff --git a/src/com/android/bluetooth/btservice/AdapterState.java b/src/com/android/bluetooth/btservice/AdapterState.java index 89ab1467e..b2d96899f 100644 --- a/src/com/android/bluetooth/btservice/AdapterState.java +++ b/src/com/android/bluetooth/btservice/AdapterState.java @@ -441,6 +441,7 @@ final class AdapterState extends StateMachine { case ENABLE_TIMEOUT: errorLog("Error enabling Bluetooth (enable timeout)"); + adapterService.ssrcleanupNative(false); mPendingCommandState.setBleTurningOn(false); transitionTo(mOffState); adapterService.stopProfileServices(); @@ -468,6 +469,7 @@ final class AdapterState extends StateMachine { adapterService.stopProfileServices(); adapterService.stopGattProfileService(); mPendingCommandState.setTurningOff(false); + adapterService.ssrcleanupNative(true); setBleTurningOff(false); transitionTo(mOffState); notifyAdapterStateChange(BluetoothAdapter.STATE_OFF); |