summaryrefslogtreecommitdiff
path: root/tests/net/java/com/android/server/ConnectivityServiceTest.java
diff options
context:
space:
mode:
authorChalard Jean <jchalard@google.com>2021-04-05 08:10:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-04-05 08:10:29 +0000
commit6c63ebbb9e64dbccc563eebdd079cef549d57ac8 (patch)
tree5de0bd0e03ff83c472b6d1179f231071cb029528 /tests/net/java/com/android/server/ConnectivityServiceTest.java
parent1b5c3c49e68dc6c1c96c00397f29594e1fcd61f4 (diff)
parenta776c7ca39d5d2b5fc9351ea3933012cf60535e5 (diff)
Merge "Fix a bug where the wrong profile is queried" am: f83190c218 am: 92d3c13ed8 am: a776c7ca39
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1662362 Change-Id: I5498b7eb2b1b3e4e195ac47d8d3b471496b779b6
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
-rw-r--r--tests/net/java/com/android/server/ConnectivityServiceTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 4c5e64c7695b..f903a45599c9 100644
--- 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