Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a6fd984 authored by Eric Sandness's avatar Eric Sandness Committed by android-build-merger
Browse files

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

am: c9a6e756

Change-Id: I6abbe1bf0073e236f1379a2dca208f5d3eab5e7f
parents f700d5ca c9a6e756

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

+2 −1
Original line number Diff line number Diff line
@@ -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>() {