PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use new constructor for CDM's Associations"

Browse Source
This commit is contained in:
Sergey Nikolaienkov
2021-10-21 12:01:13 +00:00
committed by Android (Google) Code Review
parent 4d30055853 52ab4af51f
commit 607409c49c
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
View File

@@ -24,6 +24,7 @@ import static org.mockito.Mockito.when;
import android.companion.Association; import android.companion.Association;
import android.companion.CompanionDeviceManager; import android.companion.CompanionDeviceManager;
import android.companion.DeviceId;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -97,8 +98,20 @@ public class BluetoothDetailsCompanionAppsControllerTest extends
private void addFakeAssociation(String packageName, CharSequence appName) { private void addFakeAssociation(String packageName, CharSequence appName) {
setupFakeLabelAndInfo(packageName, appName); setupFakeLabelAndInfo(packageName, appName);
Association association = new Association(
0, mCachedDevice.getAddress(), packageName, "", true, System.currentTimeMillis()); final int associationId = mAssociations.size() + 1;
final DeviceId deviceId =
new DeviceId(DeviceId.TYPE_MAC_ADDRESS, mCachedDevice.getAddress());
final Association association = new Association(
associationId,
/* userId */ 0,
packageName,
Arrays.asList(deviceId),
/* deviceProfile */ "",
/* managedByCompanionApp */ false,
/* notifyOnDeviceNearby */ true,
/* timeApprovedMs */ System.currentTimeMillis());
mAssociations.add(association); mAssociations.add(association);
showScreen(mController); showScreen(mController);
} }