Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix mock of setApplicationRestrictions()" into oc-dev

Browse Source
This commit is contained in:
Eric Sandness
2017-04-10 12:18:08 +00:00
committed by Android (Google) Code Review
parent b96891e0e3 a9b8253b38
commit c9a6e75682
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java
View File

@@ -92,6 +92,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.nullable;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.times;
@@ -213,7 +214,7 @@ public class DevicePolicyManagerTest extends DpmTestBase {
return null;
}
}).when(mContext.userManager).setApplicationRestrictions(
anyString(), any(Bundle.class), any(UserHandle.class));
anyString(), nullable(Bundle.class), any(UserHandle.class));
// UM.getApplicationRestrictions() will read from appRestrictions.
doAnswer(new Answer<Bundle>() {