Merge "Fix usages of renamed Association class" (977ae951) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsController.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ package com.android.settings.bluetooth;

	import static com.android.internal.util.CollectionUtils.filter;		import static com.android.internal.util.CollectionUtils.filter;

	import android.companion.Association;		import android.companion.AssociationInfo;
	import android.companion.CompanionDeviceManager;		import android.companion.CompanionDeviceManager;
	import android.companion.ICompanionDeviceManager;		import android.companion.ICompanionDeviceManager;
	import android.content.Context;		import android.content.Context;
	@@ -88,7 +88,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
	mProfilesContainer.setLayoutResource(R.layout.preference_companion_app);		mProfilesContainer.setLayoutResource(R.layout.preference_companion_app);
	}		}

	private List<Association> getAssociations(String address) {		private List<AssociationInfo> getAssociations(String address) {
	return filter(		return filter(
	mCompanionDeviceManager.getAllAssociations(),		mCompanionDeviceManager.getAllAssociations(),
	a -> Objects.equal(address, a.getDeviceMacAddress()));		a -> Objects.equal(address, a.getDeviceMacAddress()));
	@@ -150,7 +150,7 @@ public class BluetoothDetailsCompanionAppsController extends BluetoothDetailsCon
	private List<String> getPreferencesNeedToShow(String address, PreferenceCategory container) {		private List<String> getPreferencesNeedToShow(String address, PreferenceCategory container) {
	List<String> preferencesToRemove = new ArrayList<>();		List<String> preferencesToRemove = new ArrayList<>();
	Set<String> packages = getAssociations(address)		Set<String> packages = getAssociations(address)
	.stream().map(Association::getPackageName)		.stream().map(AssociationInfo::getPackageName)
	.collect(Collectors.toSet());		.collect(Collectors.toSet());

	for (int i = 0; i < container.getPreferenceCount(); i++) {		for (int i = 0; i < container.getPreferenceCount(); i++) {

tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ import static org.mockito.Mockito.mock;
	import static org.mockito.Mockito.spy;		import static org.mockito.Mockito.spy;
	import static org.mockito.Mockito.when;		import static org.mockito.Mockito.when;

	import android.companion.Association;		import android.companion.AssociationInfo;
	import android.companion.CompanionDeviceManager;		import android.companion.CompanionDeviceManager;
	import android.companion.DeviceId;		import android.companion.DeviceId;
	import android.content.pm.ApplicationInfo;		import android.content.pm.ApplicationInfo;
	@@ -63,7 +63,7 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
	private PreferenceCategory mProfiles;		private PreferenceCategory mProfiles;
	private List<String> mPackages;		private List<String> mPackages;
	private List<CharSequence> mAppNames;		private List<CharSequence> mAppNames;
	private List<Association> mAssociations;		private List<AssociationInfo> mAssociations;


	@Override		@Override
	@@ -102,7 +102,7 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
	final int associationId = mAssociations.size() + 1;		final int associationId = mAssociations.size() + 1;
	final DeviceId deviceId =		final DeviceId deviceId =
	new DeviceId(DeviceId.TYPE_MAC_ADDRESS, mCachedDevice.getAddress());		new DeviceId(DeviceId.TYPE_MAC_ADDRESS, mCachedDevice.getAddress());
	final Association association = new Association(		final AssociationInfo association = new AssociationInfo(
	associationId,		associationId,
	/* userId */ 0,		/* userId */ 0,
	packageName,		packageName,