Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5bcf6bc authored by William Escande's avatar William Escande
Browse files

SystemServer: Early return in the serviceConnection 

Bug: 311772251
Test: m service-bluetooth | no-op change
Change-Id: Ia6073398bf189d94687f7cd8b690755a65ccec1b
parent 3c2b9764

service/src/com/android/server/bluetooth/BluetoothManagerService.java

+9 −9
Original line number Diff line number Diff line
@@ -1551,7 +1551,10 @@ class BluetoothManagerService { 
        }



        private void removeProxy(IBluetoothProfileServiceConnection proxy) {

            if (proxy != null) {

            if (proxy == null) {

                Log.w(TAG, "removeProxy: null proxy for " + mIntent);

                return;

            }

            if (mProxies.unregister(proxy)) {

                try {

                    proxy.onServiceDisconnected(mClassName);
@@ -1559,9 +1562,6 @@ class BluetoothManagerService { 
                    Log.e(TAG, "Unable to disconnect proxy", e);

                }

            }

            } else {

                Log.w(TAG, "Trying to remove a null proxy");

            }

        }



        private void removeAllProxies() {