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

Commit 4f2ec1ee authored by Raphael Kim's avatar Raphael Kim Committed by Android (Google) Code Review
Browse files

Merge "[CDM] Fix a bug where CDM transport was not automatically cleaned up." into main

parents b7138e53 1b01539a

services/companion/java/com/android/server/companion/transport/CompanionTransportManager.java

+2 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ public class CompanionTransportManager { 
                return;

            }



            transport.stop();

            transport.close();

            notifyOnTransportsChanged();

        }
@@ -281,6 +281,7 @@ public class CompanionTransportManager { 
        int flags = association.getTransportFlags();

        Transport transport = createTransport(association, fd, preSharedKey, flags);

        addListenersToTransport(transport);

        transport.setOnTransportClosedListener(this::detachSystemDataTransport);

        transport.start();

        synchronized (mTransports) {

            mTransports.put(association.getId(), transport);