Check for NLS service intent filter when rebinding services (8d91ced2) · Commits · e / os / android_frameworks_base

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

+26 −10

Original line number	Original line	Diff line number	Diff line
	@@ -106,7 +106,8 @@ abstract public class ManagedServices {
	protected final String TAG = getClass().getSimpleName().replace('$', '.');		protected final String TAG = getClass().getSimpleName().replace('$', '.');
	protected final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);		protected final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);

	private static final int ON_BINDING_DIED_REBIND_DELAY_MS = 10000;		protected static final int ON_BINDING_DIED_REBIND_DELAY_MS = 10000;
			protected static final int ON_BINDING_DIED_REBIND_MSG = 1234;
	protected static final String ENABLED_SERVICES_SEPARATOR = ":";		protected static final String ENABLED_SERVICES_SEPARATOR = ":";
	private static final String DB_VERSION_1 = "1";		private static final String DB_VERSION_1 = "1";
	private static final String DB_VERSION_2 = "2";		private static final String DB_VERSION_2 = "2";
	@@ -856,7 +857,13 @@ abstract public class ManagedServices {
	String approvedItem = getApprovedValue(pkgOrComponent);		String approvedItem = getApprovedValue(pkgOrComponent);

	if (approvedItem != null) {		if (approvedItem != null) {
			final ComponentName component = ComponentName.unflattenFromString(approvedItem);
	if (enabled) {		if (enabled) {
			if (component != null && !isValidService(component, userId)) {
			Log.e(TAG, "Skip allowing " + mConfig.caption + " " + pkgOrComponent
			+ " (userSet: " + userSet + ") for invalid service");
			return;
			}
	approved.add(approvedItem);		approved.add(approvedItem);
	} else {		} else {
	approved.remove(approvedItem);		approved.remove(approvedItem);
	@@ -954,7 +961,7 @@ abstract public class ManagedServices {
	\|\| isPackageOrComponentAllowed(component.getPackageName(), userId))) {		\|\| isPackageOrComponentAllowed(component.getPackageName(), userId))) {
	return false;		return false;
	}		}
	return componentHasBindPermission(component, userId);		return isValidService(component, userId);
	}		}

	private boolean componentHasBindPermission(ComponentName component, int userId) {		private boolean componentHasBindPermission(ComponentName component, int userId) {
	@@ -1306,11 +1313,12 @@ abstract public class ManagedServices {
	if (TextUtils.equals(getPackageName(approvedPackageOrComponent), packageName)) {		if (TextUtils.equals(getPackageName(approvedPackageOrComponent), packageName)) {
	final ComponentName component = ComponentName.unflattenFromString(		final ComponentName component = ComponentName.unflattenFromString(
	approvedPackageOrComponent);		approvedPackageOrComponent);
	if (component != null && !componentHasBindPermission(component, userId)) {		if (component != null && !isValidService(component, userId)) {
	approved.removeAt(j);		approved.removeAt(j);
	if (DEBUG) {		if (DEBUG) {
	Slog.v(TAG, "Removing " + approvedPackageOrComponent		Slog.v(TAG, "Removing " + approvedPackageOrComponent
	+ " from approved list; no bind permission found "		+ " from approved list; no bind permission or "
			+ "service interface filter found "
	+ mConfig.bindPermission);		+ mConfig.bindPermission);
	}		}
	}		}
	@@ -1329,6 +1337,11 @@ abstract public class ManagedServices {
	}		}
	}		}

			protected boolean isValidService(ComponentName component, int userId) {
			return componentHasBindPermission(component, userId) && queryPackageForServices(
			component.getPackageName(), userId).contains(component);
			}

	protected boolean isValidEntry(String packageOrComponent, int userId) {		protected boolean isValidEntry(String packageOrComponent, int userId) {
	return hasMatchingServices(packageOrComponent, userId);		return hasMatchingServices(packageOrComponent, userId);
	}		}
	@@ -1486,23 +1499,25 @@ abstract public class ManagedServices {
	* Called when user switched to unbind all services from other users.		* Called when user switched to unbind all services from other users.
	*/		*/
	@VisibleForTesting		@VisibleForTesting
	void unbindOtherUserServices(int currentUser) {		void unbindOtherUserServices(int switchedToUser) {
	TimingsTraceAndSlog t = new TimingsTraceAndSlog();		TimingsTraceAndSlog t = new TimingsTraceAndSlog();
	t.traceBegin("ManagedServices.unbindOtherUserServices_current" + currentUser);		t.traceBegin("ManagedServices.unbindOtherUserServices_current" + switchedToUser);
	unbindServicesImpl(currentUser, true /* allExceptUser */);		unbindServicesImpl(switchedToUser, true /* allExceptUser */);
	t.traceEnd();		t.traceEnd();
	}		}

	void unbindUserServices(int user) {		void unbindUserServices(int removedUser) {
	TimingsTraceAndSlog t = new TimingsTraceAndSlog();		TimingsTraceAndSlog t = new TimingsTraceAndSlog();
	t.traceBegin("ManagedServices.unbindUserServices" + user);		t.traceBegin("ManagedServices.unbindUserServices" + removedUser);
	unbindServicesImpl(user, false /* allExceptUser */);		unbindServicesImpl(removedUser, false /* allExceptUser */);
	t.traceEnd();		t.traceEnd();
	}		}

	void unbindServicesImpl(int user, boolean allExceptUser) {		void unbindServicesImpl(int user, boolean allExceptUser) {
	final SparseArray<Set<ComponentName>> componentsToUnbind = new SparseArray<>();		final SparseArray<Set<ComponentName>> componentsToUnbind = new SparseArray<>();
	synchronized (mMutex) {		synchronized (mMutex) {
			// Remove enqueued rebinds to avoid rebinding services for a switched user
			mHandler.removeMessages(ON_BINDING_DIED_REBIND_MSG);
	final Set<ManagedServiceInfo> removableBoundServices = getRemovableConnectedServices();		final Set<ManagedServiceInfo> removableBoundServices = getRemovableConnectedServices();
	for (ManagedServiceInfo info : removableBoundServices) {		for (ManagedServiceInfo info : removableBoundServices) {
	if ((allExceptUser && (info.userid != user))		if ((allExceptUser && (info.userid != user))
	@@ -1697,6 +1712,7 @@ abstract public class ManagedServices {
	mServicesRebinding.add(servicesBindingTag);		mServicesRebinding.add(servicesBindingTag);
	mHandler.postDelayed(() ->		mHandler.postDelayed(() ->
	reregisterService(name, userid),		reregisterService(name, userid),
			ON_BINDING_DIED_REBIND_MSG,
	ON_BINDING_DIED_REBIND_DELAY_MS);		ON_BINDING_DIED_REBIND_DELAY_MS);
	} else {		} else {
	Slog.v(TAG, getCaption() + " not rebinding in user " + userid		Slog.v(TAG, getCaption() + " not rebinding in user " + userid

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

+197 −9

Original line number	Original line	Diff line number	Diff line
	@@ -63,11 +63,13 @@ import android.os.Build;
	import android.os.Bundle;		import android.os.Bundle;
	import android.os.IBinder;		import android.os.IBinder;
	import android.os.IInterface;		import android.os.IInterface;
			import android.os.Looper;
	import android.os.RemoteException;		import android.os.RemoteException;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
	import android.platform.test.annotations.EnableFlags;		import android.platform.test.annotations.EnableFlags;
	import android.provider.Settings;		import android.provider.Settings;
			import android.testing.TestableLooper;
	import android.text.TextUtils;		import android.text.TextUtils;
	import android.util.ArrayMap;		import android.util.ArrayMap;
	import android.util.ArraySet;		import android.util.ArraySet;
	@@ -82,6 +84,7 @@ import com.android.server.UiServiceTestCase;

	import com.google.android.collect.Lists;		import com.google.android.collect.Lists;

			import org.junit.After;
	import org.junit.Before;		import org.junit.Before;
	import org.junit.Test;		import org.junit.Test;
	import org.mockito.ArgumentCaptor;		import org.mockito.ArgumentCaptor;
	@@ -103,6 +106,7 @@ import java.util.List;
	import java.util.Set;		import java.util.Set;
	import java.util.concurrent.CountDownLatch;		import java.util.concurrent.CountDownLatch;


	public class ManagedServicesTest extends UiServiceTestCase {		public class ManagedServicesTest extends UiServiceTestCase {

	@Mock		@Mock
	@@ -115,6 +119,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	private ManagedServices.UserProfiles mUserProfiles;		private ManagedServices.UserProfiles mUserProfiles;
	@Mock private DevicePolicyManager mDpm;		@Mock private DevicePolicyManager mDpm;
	Object mLock = new Object();		Object mLock = new Object();
			private TestableLooper mTestableLooper;

	UserInfo mZero = new UserInfo(0, "zero", 0);		UserInfo mZero = new UserInfo(0, "zero", 0);
	UserInfo mTen = new UserInfo(10, "ten", 0);		UserInfo mTen = new UserInfo(10, "ten", 0);
	@@ -142,6 +147,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	@Before		@Before
	public void setUp() throws Exception {		public void setUp() throws Exception {
	MockitoAnnotations.initMocks(this);		MockitoAnnotations.initMocks(this);
			mTestableLooper = new TestableLooper(Looper.getMainLooper());

	mContext.setMockPackageManager(mPm);		mContext.setMockPackageManager(mPm);
	mContext.addMockSystemService(Context.USER_SERVICE, mUm);		mContext.addMockSystemService(Context.USER_SERVICE, mUm);
	@@ -199,6 +205,11 @@ public class ManagedServicesTest extends UiServiceTestCase {
	mIpm, APPROVAL_BY_COMPONENT);		mIpm, APPROVAL_BY_COMPONENT);
	}		}

			@After
			public void tearDown() throws Exception {
			mTestableLooper.destroy();
			}

	@Test		@Test
	public void testBackupAndRestore_migration() throws Exception {		public void testBackupAndRestore_migration() throws Exception {
	for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {		for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
	@@ -888,7 +899,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	return true;		return true;
	});		});

	mockServiceInfoWithMetaData(List.of(cn), service, new ArrayMap<>());		mockServiceInfoWithMetaData(List.of(cn), service, pm, new ArrayMap<>());
	service.addApprovedList("a", 0, true);		service.addApprovedList("a", 0, true);

	service.reregisterService(cn, 0);		service.reregisterService(cn, 0);
	@@ -919,7 +930,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	return true;		return true;
	});		});

	mockServiceInfoWithMetaData(List.of(cn), service, new ArrayMap<>());		mockServiceInfoWithMetaData(List.of(cn), service, pm, new ArrayMap<>());
	service.addApprovedList("a", 0, false);		service.addApprovedList("a", 0, false);

	service.reregisterService(cn, 0);		service.reregisterService(cn, 0);
	@@ -950,7 +961,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	return true;		return true;
	});		});

	mockServiceInfoWithMetaData(List.of(cn), service, new ArrayMap<>());		mockServiceInfoWithMetaData(List.of(cn), service, pm, new ArrayMap<>());
	service.addApprovedList("a/a", 0, true);		service.addApprovedList("a/a", 0, true);

	service.reregisterService(cn, 0);		service.reregisterService(cn, 0);
	@@ -981,7 +992,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	return true;		return true;
	});		});

	mockServiceInfoWithMetaData(List.of(cn), service, new ArrayMap<>());		mockServiceInfoWithMetaData(List.of(cn), service, pm, new ArrayMap<>());
	service.addApprovedList("a/a", 0, false);		service.addApprovedList("a/a", 0, false);

	service.reregisterService(cn, 0);		service.reregisterService(cn, 0);
	@@ -1052,6 +1063,77 @@ public class ManagedServicesTest extends UiServiceTestCase {
	assertTrue(service.isBound(cn, 11));		assertTrue(service.isBound(cn, 11));
	}		}

			@Test
			public void registerService_bindingDied_rebindIsClearedOnUserSwitch() throws Exception {
			Context context = mock(Context.class);
			PackageManager pm = mock(PackageManager.class);
			ApplicationInfo ai = new ApplicationInfo();
			ai.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT;

			when(context.getPackageName()).thenReturn(mPkg);
			when(context.getUserId()).thenReturn(mUser.getIdentifier());
			when(context.getPackageManager()).thenReturn(pm);
			when(pm.getApplicationInfo(anyString(), anyInt())).thenReturn(ai);

			ManagedServices service = new TestManagedServices(context, mLock, mUserProfiles, mIpm,
			APPROVAL_BY_PACKAGE);
			service = spy(service);
			ComponentName cn = ComponentName.unflattenFromString("a/a");

			// Trigger onBindingDied for component when registering
			// => will schedule a rebind in 10 seconds
			when(context.bindServiceAsUser(any(), any(), anyInt(), any())).thenAnswer(invocation -> {
			Object[] args = invocation.getArguments();
			ServiceConnection sc = (ServiceConnection) args[1];
			sc.onBindingDied(cn);
			return true;
			});
			service.registerService(cn, 0);
			assertThat(service.isBound(cn, 0)).isFalse();

			// Switch to user 10
			service.onUserSwitched(10);

			// Check that the scheduled rebind for user 0 was cleared
			mTestableLooper.moveTimeForward(ManagedServices.ON_BINDING_DIED_REBIND_DELAY_MS);
			mTestableLooper.processAllMessages();
			verify(service, never()).reregisterService(any(), anyInt());
			}

			@Test
			public void registerService_bindingDied_rebindIsExecutedAfterTimeout() throws Exception {
			Context context = mock(Context.class);
			PackageManager pm = mock(PackageManager.class);
			ApplicationInfo ai = new ApplicationInfo();
			ai.targetSdkVersion = Build.VERSION_CODES.CUR_DEVELOPMENT;

			when(context.getPackageName()).thenReturn(mPkg);
			when(context.getUserId()).thenReturn(mUser.getIdentifier());
			when(context.getPackageManager()).thenReturn(pm);
			when(pm.getApplicationInfo(anyString(), anyInt())).thenReturn(ai);

			ManagedServices service = new TestManagedServices(context, mLock, mUserProfiles, mIpm,
			APPROVAL_BY_PACKAGE);
			service = spy(service);
			ComponentName cn = ComponentName.unflattenFromString("a/a");

			// Trigger onBindingDied for component when registering
			// => will schedule a rebind in 10 seconds
			when(context.bindServiceAsUser(any(), any(), anyInt(), any())).thenAnswer(invocation -> {
			Object[] args = invocation.getArguments();
			ServiceConnection sc = (ServiceConnection) args[1];
			sc.onBindingDied(cn);
			return true;
			});
			service.registerService(cn, 0);
			assertThat(service.isBound(cn, 0)).isFalse();

			// Check that the scheduled rebind is run
			mTestableLooper.moveTimeForward(ManagedServices.ON_BINDING_DIED_REBIND_DELAY_MS);
			mTestableLooper.processAllMessages();
			verify(service, times(1)).reregisterService(eq(cn), eq(0));
			}

	@Test		@Test
	public void testPackageUninstall_packageNoLongerInApprovedList() throws Exception {		public void testPackageUninstall_packageNoLongerInApprovedList() throws Exception {
	for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {		for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
	@@ -1210,6 +1292,64 @@ public class ManagedServicesTest extends UiServiceTestCase {
	assertTrue(service.isComponentEnabledForCurrentProfiles(approvedComponent));		assertTrue(service.isComponentEnabledForCurrentProfiles(approvedComponent));
	}		}

			@Test
			public void testUpgradeAppNoIntentFilterNoRebind() throws Exception {
			Context context = spy(getContext());
			doReturn(true).when(context).bindServiceAsUser(any(), any(), anyInt(), any());

			ManagedServices service = new TestManagedServices(context, mLock, mUserProfiles,
			mIpm, APPROVAL_BY_COMPONENT);

			List<String> packages = new ArrayList<>();
			packages.add("package");
			addExpectedServices(service, packages, 0);

			final ComponentName unapprovedComponent = ComponentName.unflattenFromString("package/C1");
			final ComponentName approvedComponent = ComponentName.unflattenFromString("package/C2");

			// Both components are approved initially
			mExpectedPrimaryComponentNames.clear();
			mExpectedPrimaryPackages.clear();
			mExpectedPrimaryComponentNames.put(0, "package/C1:package/C2");
			mExpectedSecondaryComponentNames.clear();
			mExpectedSecondaryPackages.clear();

			loadXml(service);

			//Component package/C1 loses serviceInterface intent filter
			ManagedServices.Config config = service.getConfig();
			when(mPm.queryIntentServicesAsUser(any(), anyInt(), anyInt()))
			.thenAnswer(new Answer<List<ResolveInfo>>() {
			@Override
			public List<ResolveInfo> answer(InvocationOnMock invocationOnMock)
			throws Throwable {
			Object[] args = invocationOnMock.getArguments();
			Intent invocationIntent = (Intent) args[0];
			if (invocationIntent != null) {
			if (invocationIntent.getAction().equals(config.serviceInterface)
			&& packages.contains(invocationIntent.getPackage())) {
			List<ResolveInfo> dummyServices = new ArrayList<>();
			ResolveInfo resolveInfo = new ResolveInfo();
			ServiceInfo serviceInfo = new ServiceInfo();
			serviceInfo.packageName = invocationIntent.getPackage();
			serviceInfo.name = approvedComponent.getClassName();
			serviceInfo.permission = service.getConfig().bindPermission;
			resolveInfo.serviceInfo = serviceInfo;
			dummyServices.add(resolveInfo);
			return dummyServices;
			}
			}
			return new ArrayList<>();
			}
			});

			// Trigger package update
			service.onPackagesChanged(false, new String[]{"package"}, new int[]{0});

			assertFalse(service.isComponentEnabledForCurrentProfiles(unapprovedComponent));
			assertTrue(service.isComponentEnabledForCurrentProfiles(approvedComponent));
			}

	@Test		@Test
	public void testSetPackageOrComponentEnabled() throws Exception {		public void testSetPackageOrComponentEnabled() throws Exception {
	for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {		for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
	@@ -1223,6 +1363,21 @@ public class ManagedServicesTest extends UiServiceTestCase {
	"user10package1/K", "user10.3/Component", "user10package2/L",		"user10package1/K", "user10.3/Component", "user10package2/L",
	"user10.4/Component"}));		"user10.4/Component"}));

			// mock permissions for services
			PackageManager pm = mock(PackageManager.class);
			when(getContext().getPackageManager()).thenReturn(pm);
			List<ComponentName> enabledComponents = List.of(
			ComponentName.unflattenFromString("package/Comp"),
			ComponentName.unflattenFromString("package/C2"),
			ComponentName.unflattenFromString("again/M4"),
			ComponentName.unflattenFromString("user10package/B"),
			ComponentName.unflattenFromString("user10/Component"),
			ComponentName.unflattenFromString("user10package1/K"),
			ComponentName.unflattenFromString("user10.3/Component"),
			ComponentName.unflattenFromString("user10package2/L"),
			ComponentName.unflattenFromString("user10.4/Component"));
			mockServiceInfoWithMetaData(enabledComponents, service, pm, new ArrayMap<>());

	for (int userId : expectedEnabled.keySet()) {		for (int userId : expectedEnabled.keySet()) {
	ArrayList<String> expectedForUser = expectedEnabled.get(userId);		ArrayList<String> expectedForUser = expectedEnabled.get(userId);
	for (int i = 0; i < expectedForUser.size(); i++) {		for (int i = 0; i < expectedForUser.size(); i++) {
	@@ -1944,7 +2099,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	metaDataAutobindAllow.putBoolean(META_DATA_DEFAULT_AUTOBIND, true);		metaDataAutobindAllow.putBoolean(META_DATA_DEFAULT_AUTOBIND, true);
	metaDatas.put(cn_allowed, metaDataAutobindAllow);		metaDatas.put(cn_allowed, metaDataAutobindAllow);

	mockServiceInfoWithMetaData(componentNames, service, metaDatas);		mockServiceInfoWithMetaData(componentNames, service, pm, metaDatas);

	service.addApprovedList(cn_allowed.flattenToString(), 0, true);		service.addApprovedList(cn_allowed.flattenToString(), 0, true);
	service.addApprovedList(cn_disallowed.flattenToString(), 0, true);		service.addApprovedList(cn_disallowed.flattenToString(), 0, true);
	@@ -1989,7 +2144,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	metaDataAutobindDisallow.putBoolean(META_DATA_DEFAULT_AUTOBIND, false);		metaDataAutobindDisallow.putBoolean(META_DATA_DEFAULT_AUTOBIND, false);
	metaDatas.put(cn_disallowed, metaDataAutobindDisallow);		metaDatas.put(cn_disallowed, metaDataAutobindDisallow);

	mockServiceInfoWithMetaData(componentNames, service, metaDatas);		mockServiceInfoWithMetaData(componentNames, service, pm, metaDatas);

	service.addApprovedList(cn_disallowed.flattenToString(), 0, true);		service.addApprovedList(cn_disallowed.flattenToString(), 0, true);

	@@ -2028,7 +2183,7 @@ public class ManagedServicesTest extends UiServiceTestCase {
	metaDataAutobindDisallow.putBoolean(META_DATA_DEFAULT_AUTOBIND, false);		metaDataAutobindDisallow.putBoolean(META_DATA_DEFAULT_AUTOBIND, false);
	metaDatas.put(cn_disallowed, metaDataAutobindDisallow);		metaDatas.put(cn_disallowed, metaDataAutobindDisallow);

	mockServiceInfoWithMetaData(componentNames, service, metaDatas);		mockServiceInfoWithMetaData(componentNames, service, pm, metaDatas);

	service.addApprovedList(cn_disallowed.flattenToString(), 0, true);		service.addApprovedList(cn_disallowed.flattenToString(), 0, true);

	@@ -2099,8 +2254,8 @@ public class ManagedServicesTest extends UiServiceTestCase {
	}		}

	private void mockServiceInfoWithMetaData(List<ComponentName> componentNames,		private void mockServiceInfoWithMetaData(List<ComponentName> componentNames,
	ManagedServices service, ArrayMap<ComponentName, Bundle> metaDatas)		ManagedServices service, PackageManager packageManager,
	throws RemoteException {		ArrayMap<ComponentName, Bundle> metaDatas) throws RemoteException {
	when(mIpm.getServiceInfo(any(), anyLong(), anyInt())).thenAnswer(		when(mIpm.getServiceInfo(any(), anyLong(), anyInt())).thenAnswer(
	(Answer<ServiceInfo>) invocation -> {		(Answer<ServiceInfo>) invocation -> {
	ComponentName invocationCn = invocation.getArgument(0);		ComponentName invocationCn = invocation.getArgument(0);
	@@ -2115,6 +2270,39 @@ public class ManagedServicesTest extends UiServiceTestCase {
	return null;		return null;
	}		}
	);		);

			// add components to queryIntentServicesAsUser response
			final List<String> packages = new ArrayList<>();
			for (ComponentName cn: componentNames) {
			packages.add(cn.getPackageName());
			}
			ManagedServices.Config config = service.getConfig();
			when(packageManager.queryIntentServicesAsUser(any(), anyInt(), anyInt())).
			thenAnswer(new Answer<List<ResolveInfo>>() {
			@Override
			public List<ResolveInfo> answer(InvocationOnMock invocationOnMock)
			throws Throwable {
			Object[] args = invocationOnMock.getArguments();
			Intent invocationIntent = (Intent) args[0];
			if (invocationIntent != null) {
			if (invocationIntent.getAction().equals(config.serviceInterface)
			&& packages.contains(invocationIntent.getPackage())) {
			List<ResolveInfo> dummyServices = new ArrayList<>();
			for (ComponentName cn: componentNames) {
			ResolveInfo resolveInfo = new ResolveInfo();
			ServiceInfo serviceInfo = new ServiceInfo();
			serviceInfo.packageName = invocationIntent.getPackage();
			serviceInfo.name = cn.getClassName();
			serviceInfo.permission = service.getConfig().bindPermission;
			resolveInfo.serviceInfo = serviceInfo;
			dummyServices.add(resolveInfo);
			}
			return dummyServices;
			}
			}
			return new ArrayList<>();
			}
			});
	}		}

	private void resetComponentsAndPackages() {		private void resetComponentsAndPackages() {

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

+10 −0