diff options
| author | lucaslin <lucaslin@google.com> | 2020-12-10 13:12:51 +0800 |
|---|---|---|
| committer | lucaslin <lucaslin@google.com> | 2020-12-10 13:58:39 +0800 |
| commit | fefbeecb4b19aaa62b669fd550643f6a90da5849 (patch) | |
| tree | e9ae0c4878c581cb8f4dcd728c958352abe3ab14 /tests/net/java/com/android | |
| parent | a0f97a84e4e4f80474f851386488539b6a62d080 (diff) | |
Use getUserHandles() instead of getUsers() to get user id
UserManager#getUsers() is a hidden API, use getUserHandles() to
get user id instead in PermissionMonitor.
Bug: 171529940
Test: atest FrameworksNetTests
Change-Id: Ic304627688de8e49505a95ebc99628b2e0eafab9
Diffstat (limited to 'tests/net/java/com/android')
| -rw-r--r-- | tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java index de35f910d53a..3556c72776dc 100644 --- a/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java +++ b/tests/net/java/com/android/server/connectivity/PermissionMonitorTest.java @@ -58,7 +58,6 @@ import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.PackageManagerInternal; -import android.content.pm.UserInfo; import android.net.INetd; import android.net.UidRange; import android.os.Build; @@ -123,10 +122,10 @@ public class PermissionMonitorTest { MockitoAnnotations.initMocks(this); when(mContext.getPackageManager()).thenReturn(mPackageManager); when(mContext.getSystemService(eq(Context.USER_SERVICE))).thenReturn(mUserManager); - when(mUserManager.getAliveUsers()).thenReturn( - Arrays.asList(new UserInfo[] { - new UserInfo(MOCK_USER1, "", 0), - new UserInfo(MOCK_USER2, "", 0), + when(mUserManager.getUserHandles(eq(true))).thenReturn( + Arrays.asList(new UserHandle[] { + new UserHandle(MOCK_USER1), + new UserHandle(MOCK_USER2), })); mPermissionMonitor = spy(new PermissionMonitor(mContext, mNetdService, mDeps)); |