diff options
| author | 2020-12-02 15:59:55 +0000 | |
|---|---|---|
| committer | 2020-12-02 15:59:55 +0000 | |
| commit | 485e78b4cbc08939ccded3669403c5192f43a53e (patch) | |
| tree | ea633c942bfd81e3aedb2628df0f84cf461292ba /services | |
| parent | 4ccbda59f51bda078471b1ec8f5c61ec5b454904 (diff) | |
| parent | 7b8636fdb0dfc5ef727365cdf42a2fb56bdffeb2 (diff) | |
Merge "1/N The road to Material NEXT (bouncer and shade)"
Diffstat (limited to 'services')
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 77090a8e0d83..e2c5e97b8896 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -4252,10 +4252,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { mContext.packageName = admin1.getPackageName(); mContext.applicationInfo = new ApplicationInfo(); - when(mContext.resources.getColor(eq(R.color.notification_action_list), anyObject())) - .thenReturn(Color.WHITE); - when(mContext.resources.getColor(eq(R.color.notification_material_background_color), - anyObject())).thenReturn(Color.WHITE); + when(mContext.resources.getColor(anyInt(), anyObject())).thenReturn(Color.WHITE); // setUp() adds a secondary user for CALLER_USER_HANDLE. Remove it as otherwise the // feature is disabled because there are non-affiliated secondary users. @@ -4301,10 +4298,7 @@ public class DevicePolicyManagerTest extends DpmTestBase { setupDeviceOwner(); mContext.packageName = admin1.getPackageName(); mContext.applicationInfo = new ApplicationInfo(); - when(mContext.resources.getColor(eq(R.color.notification_action_list), anyObject())) - .thenReturn(Color.WHITE); - when(mContext.resources.getColor(eq(R.color.notification_material_background_color), - anyObject())).thenReturn(Color.WHITE); + when(mContext.resources.getColor(anyInt(), anyObject())).thenReturn(Color.WHITE); // setUp() adds a secondary user for CALLER_USER_HANDLE. Remove it as otherwise the // feature is disabled because there are non-affiliated secondary users. |