Merge "Merge "Calls unlinkToDeath in binderDied to deregister" am: 72fa61b325 am: d961f427a4" into pi-dev-plus-aosp

1 files changed, 1 insertions, 20 deletions

diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index ae56cb92686e..216794139c41 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -637,29 +637,10 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                 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() {