From 60967ccf49cc68ec7cc6f9f491eb6bbfbe8f57c1 Mon Sep 17 00:00:00 2001
From: Chalard Jean <jchalard@google.com>
Date: Fri, 2 Apr 2021 19:24:44 +0900
Subject: Fix a bug where the wrong profile is queried

UserManager#isManagedProfile() is not aware of the user
handle of the context the UM instance is created on.
Instead, call isManagedProfile(int).

Bug: 183625645
Test: ConnectivityServiceTest
Change-Id: I1fef22d67d75df25a8c2d0694f857c3e1c1a1306
---
 tests/net/java/com/android/server/ConnectivityServiceTest.java | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')

diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 7ac488d7de21..83e94fe047b1 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -572,6 +572,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
-- 
cgit v1.2.3