commit d961f427a4852d205807a66fe0821b1ff173440a
author Stanley Tng <stng@google.com> Wed Mar 21 23:29:40 2018 +0000
committer android-build-merger <android-build-merger@google.com> Wed Mar 21 23:29:40 2018 +0000
tree 2bd4d1ac9ec1727f4aa95df064d2f2827296fd69
parent aef63dde7019c4198c7591c01991fbfb145d7460
parent 72fa61b3250529504a9f5dab2e927a0d2e873f58

Merge "Calls unlinkToDeath in binderDied to deregister"
am: 72fa61b325

Change-Id: Ica7438fe5ebd978192226f3e2b8a0630b843b752

services/core/java/com/android/server/BluetoothManagerService.java

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 62bab76..a7515e5 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -637,29 +637,10 @@
                 IBinder token = entry.getKey();
                 ClientDeathRecipient deathRec = entry.getValue();
                 if (deathRec.equals(this)) {
-                    mBleApps.remove(token);
+                    updateBleAppCount(token, false, mPackageName);
                     break;
                 }
             }
-
-            if (isBleAppPresent()) {
-                // Nothing to do, another app is here.
-                return;
-            }
-            if (DBG) {
-                Slog.d(TAG, "Disabling LE only mode after application crash");
-            }
-            try {
-                mBluetoothLock.readLock().lock();
-                if (mBluetooth != null && mBluetooth.getState() == BluetoothAdapter.STATE_BLE_ON) {
-                    mEnable = false;
-                    mBluetooth.onBrEdrDown();
-                }
-            } catch (RemoteException e) {
-                Slog.e(TAG, "Unable to call onBrEdrDown", e);
-            } finally {
-                mBluetoothLock.readLock().unlock();
-            }
         }
 
         public String getPackageName() {