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

Commit 9904b1ef authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Handle onNullBinding" into sc-qpr1-dev am: b785d6d9 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15854017

Change-Id: I12a796310313629f321e055ee40cc8903a05bc0a
parents b52829de b785d6d9

services/core/java/com/android/server/notification/ManagedServices.java

+1 −1
Original line number Diff line number Diff line
@@ -1536,7 +1536,7 @@ abstract public class ManagedServices { 
                @Override

                public void onNullBinding(ComponentName name) {

                    Slog.v(TAG, "onNullBinding() called with: name = [" + name + "]");

                    mServicesBound.remove(servicesBindingTag);

                    mContext.unbindService(this);

                }

            };

            if (!mContext.bindServiceAsUser(intent,

services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java

+8 −8
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import com.google.android.collect.Lists; 


import org.junit.Before;

import org.junit.Test;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.invocation.InvocationOnMock;
@@ -1320,16 +1321,15 @@ public class ManagedServicesTest extends UiServiceTestCase { 
                APPROVAL_BY_COMPONENT);

        ComponentName cn = ComponentName.unflattenFromString("a/a");



        service.registerSystemService(cn, 0);

        when(context.bindServiceAsUser(any(), any(), anyInt(), any())).thenAnswer(invocation -> {

            Object[] args = invocation.getArguments();

            ServiceConnection sc = (ServiceConnection) args[1];

            sc.onNullBinding(cn);

        ArgumentCaptor<ServiceConnection> captor = ArgumentCaptor.forClass(ServiceConnection.class);

        when(context.bindServiceAsUser(any(), captor.capture(), anyInt(), any()))

                .thenAnswer(invocation -> {

                    captor.getValue().onNullBinding(cn);

                    return true;

                });



        service.registerSystemService(cn, 0);

        assertFalse(service.isBound(cn, 0));

        verify(context).unbindService(captor.getValue());

    }



    @Test