diff options
| author | Deqiang Chen <deqiangc@google.com> | 2019-03-14 16:04:41 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-14 16:04:41 -0700 |
| commit | 495d88914f52cf460a991825e9d7ff733a6858f7 (patch) | |
| tree | 8b0faaf8cc4f415c2e8eea57a63b58652dabc7da /framework/java/android/bluetooth/BluetoothA2dp.java | |
| parent | a3414b67fdaae543595e65e6e9116ebea355d79d (diff) | |
| parent | 684368381a4c7a6b72e5a78b4d4c196b837a99e5 (diff) | |
Merge "Avoid IllegalArgumentException when bluetooth is disabled" am: 4b7400c35c am: 981551ae46
am: 684368381a
Change-Id: Idb94b41924023ba3fab9694c93f17ed4ce4d01b4
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothA2dp.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothA2dp.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothA2dp.java b/framework/java/android/bluetooth/BluetoothA2dp.java index c4bf1ebd1a..442b23938c 100644 --- a/framework/java/android/bluetooth/BluetoothA2dp.java +++ b/framework/java/android/bluetooth/BluetoothA2dp.java @@ -224,8 +224,10 @@ public final class BluetoothA2dp implements BluetoothProfile { if (VDBG) Log.d(TAG, "Unbinding service..."); try { mServiceLock.writeLock().lock(); - mService = null; - mContext.unbindService(mConnection); + if (mService != null) { + mService = null; + mContext.unbindService(mConnection); + } } catch (Exception re) { Log.e(TAG, "", re); } finally { |