52
52
import org .robolectric .RobolectricTestRunner ;
53
53
import org .robolectric .annotation .Config ;
54
54
import org .robolectric .shadows .ShadowApplication ;
55
- import org .robolectric .shadows .ShadowDevicePolicyManager ;
56
55
57
56
@ RunWith (RobolectricTestRunner .class )
58
57
public final class ServiceBindingTest {
@@ -365,12 +364,12 @@ public void testBindServiceAsUser_returnsErrorWhenSdkBelowR() {
365
364
@ Test
366
365
@ Config (sdk = 28 )
367
366
public void testDevicePolicyBlind_returnsErrorWhenSdkBelowR () {
368
- String deviceAdminClassName = "DevicePolicyAdmin" ;
369
- ComponentName adminComponent = new ComponentName ( appContext , deviceAdminClassName );
370
- allowBindDeviceAdminForUser (appContext , adminComponent , 10 );
367
+ ComponentName adminComponent = new ComponentName ( appContext , "DevicePolicyAdmin" ) ;
368
+ UserHandle user10 = generateUserHandle ( /* userId= */ 10 );
369
+ allowBindDeviceAdminForUser (appContext , adminComponent , user10 );
371
370
binding =
372
371
newBuilder ()
373
- .setTargetUserHandle (UserHandle . getUserHandleForUid ( 10 ) )
372
+ .setTargetUserHandle (user10 )
374
373
.setChannelCredentials (BinderChannelCredentials .forDevicePolicyAdmin (adminComponent ))
375
374
.build ();
376
375
binding .bind ();
@@ -384,13 +383,12 @@ public void testDevicePolicyBlind_returnsErrorWhenSdkBelowR() {
384
383
@ Test
385
384
@ Config (sdk = 30 )
386
385
public void testBindWithDeviceAdmin () throws Exception {
387
- String deviceAdminClassName = "DevicePolicyAdmin" ;
388
- ComponentName adminComponent = new ComponentName ( appContext , deviceAdminClassName );
389
- allowBindDeviceAdminForUser (appContext , adminComponent , /* userId= */ 0 );
386
+ ComponentName adminComponent = new ComponentName ( appContext , "DevicePolicyAdmin" ) ;
387
+ UserHandle user0 = generateUserHandle ( /* userId= */ 0 );
388
+ allowBindDeviceAdminForUser (appContext , adminComponent , user0 );
390
389
binding =
391
390
newBuilder ()
392
- .setTargetUserHandle (UserHandle .getUserHandleForUid (/* uid= */ 0 ))
393
- .setTargetUserHandle (generateUserHandle (/* userId= */ 0 ))
391
+ .setTargetUserHandle (user0 )
394
392
.setChannelCredentials (BinderChannelCredentials .forDevicePolicyAdmin (adminComponent ))
395
393
.build ();
396
394
shadowOf (getMainLooper ()).idle ();
@@ -418,15 +416,10 @@ private void assertNoLockHeld() {
418
416
}
419
417
420
418
private static void allowBindDeviceAdminForUser (
421
- Context context , ComponentName admin , int userId ) {
422
- ShadowDevicePolicyManager devicePolicyManager =
423
- shadowOf (context .getSystemService (DevicePolicyManager .class ));
424
- devicePolicyManager .setDeviceOwner (admin );
425
- devicePolicyManager .setBindDeviceAdminTargetUsers (
426
- Arrays .asList (UserHandle .getUserHandleForUid (userId )));
427
- shadowOf ((DevicePolicyManager ) context .getSystemService (Context .DEVICE_POLICY_SERVICE ));
428
- devicePolicyManager .setDeviceOwner (admin );
429
- devicePolicyManager .setBindDeviceAdminTargetUsers (Arrays .asList (generateUserHandle (userId )));
419
+ Context context , ComponentName admin , UserHandle user ) {
420
+ DevicePolicyManager devicePolicyManager = context .getSystemService (DevicePolicyManager .class );
421
+ shadowOf (devicePolicyManager ).setBindDeviceAdminTargetUsers (Arrays .asList (user ));
422
+ shadowOf (devicePolicyManager ).setDeviceOwner (admin );
430
423
}
431
424
432
425
/** Generate UserHandles the hard way. */
0 commit comments