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

Commit 8ddcca89 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ied3b3b3e,I835f3ef9 

* changes:
  Telecomm: Fix PhoneAccountRegistrarTest
  Telecomm: Fix ConnectionServiceRepository
parents 9f691bae b69e3d64

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,

tests/src/com/android/server/telecom/tests/PhoneAccountRegistrarTest.java

+5 −3
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import java.io.ByteArrayOutputStream; 
import java.io.File;

import java.util.Arrays;

import java.util.List;

import java.util.Map;

import java.util.Set;



import static org.junit.Assert.assertEquals;
@@ -1036,9 +1037,10 @@ public class PhoneAccountRegistrarTest extends TelecomTestCase { 
            PhoneAccountRegistrar.State a, PhoneAccountRegistrar.State b) {

        assertEquals(a.defaultOutgoingAccountHandles.size(),

                b.defaultOutgoingAccountHandles.size());

        for (int i = 0; i < a.defaultOutgoingAccountHandles.size(); i++) {

            assertDefaultPhoneAccountHandleEquals(a.defaultOutgoingAccountHandles.get(i),

                    b.defaultOutgoingAccountHandles.get(i));

        for (Map.Entry<UserHandle, DefaultPhoneAccountHandle> e :

                a.defaultOutgoingAccountHandles.entrySet()) {

            assertDefaultPhoneAccountHandleEquals(e.getValue(),

                    b.defaultOutgoingAccountHandles.get(e.getKey()));

        }

        assertEquals(a.accounts.size(), b.accounts.size());

        for (int i = 0; i < a.accounts.size(); i++) {