Merge "Fix a bug where the wrong profile is queried"

2021-04-05 05:48:17 +00:00
parent 87e0ab8905 0a04bdb730
commit 167cc4a044
2 changed files with 3 additions and 8 deletions
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -578,6 +578,7 @@ public class ConnectivityServiceTest {
            final UserManager umMock = createContextAsUser(userHandle, 0 /* flags */)
                    .getSystemService(UserManager.class);
            doReturn(value).when(umMock).isManagedProfile();
+            doReturn(value).when(mUserManager).isManagedProfile(eq(userHandle.getIdentifier()));
        }

        @Override