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

Commit 35a5b07b authored by Kyle Horimoto's avatar Kyle Horimoto Committed by android-build-merger
Browse files

Merge "ContextMap: Remove connection references when an app is removed" 

am: 4cefad47

Change-Id: I20cbbebcffeacd500890237d369418553685af69
parents 1c3e2bd4 4cefad47

src/com/android/bluetooth/gatt/ContextMap.java

+15 −1
Original line number Diff line number Diff line
@@ -189,6 +189,7 @@ import com.android.bluetooth.btservice.BluetoothProto; 
            while (i.hasNext()) {

                App entry = i.next();

                if (entry.id == id) {

                    removeConnectionsByAppId(id);

                    entry.unlinkToDeath();

                    entry.appScanStats.isRegistered = false;

                    i.remove();
@@ -226,6 +227,19 @@ import com.android.bluetooth.btservice.BluetoothProto; 
        }

    }



    /**

     * Remove all connections for a given application ID.

     */

    void removeConnectionsByAppId(int appId) {

        Iterator<Connection> i = mConnections.iterator();

        while (i.hasNext()) {

            Connection connection = i.next();

            if (connection.appId == appId) {

                i.remove();

            }

        }

    }



    /**

     * Get an application context by ID.

     */