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

Commit 98c1577f authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Telecomm: Fix ConnectionServiceRepository 

Fix the cache removal.

Found by Errorprone.

(cherry picked from commit 1839ce18)

Bug: 73288226
Test: m javac-check RUN_ERROR_PRONE=true
Test: atest TelecomUnitTests
Merged-In: I835f3ef9f85cde84bb9ec6882540fc9b71c5b85e
Change-Id: I835f3ef9f85cde84bb9ec6882540fc9b71c5b85e
parent a4b839b0

src/com/android/server/telecom/ConnectionServiceRepository.java

+2 −1
Original line number Diff line number Diff line
@@ -43,7 +43,8 @@ public class ConnectionServiceRepository { 
                @Override

                public void onUnbind(ConnectionServiceWrapper service) {

                    synchronized (mLock) {

                        mServiceCache.remove(service.getComponentName());

                        mServiceCache.remove(Pair.create(service.getComponentName(),

                                service.getUserHandle()));

                    }

                }

            };

src/com/android/server/telecom/ServiceBinder.java

+4 −0
Original line number Diff line number Diff line
@@ -261,6 +261,10 @@ abstract class ServiceBinder { 
        mUserHandle = userHandle;

    }



    final UserHandle getUserHandle() {

        return mUserHandle;

    }



    final void incrementAssociatedCallCount() {

        mAssociatedCallCount++;

        Log.v(this, "Call count increment %d, %s", mAssociatedCallCount,