LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chalard Jean
2021-04-05 05:48:17 +00:00
committed by Gerrit Code Review
parent 87e0ab8905 0a04bdb730
commit 167cc4a044
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -9423,14 +9423,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
throw new IllegalArgumentException("Must explicitly specify a user handle (" throw new IllegalArgumentException("Must explicitly specify a user handle ("
+ "UserHandle.CURRENT not supported)"); + "UserHandle.CURRENT not supported)");
} }
final UserManager um; final UserManager um = mContext.getSystemService(UserManager.class);
try { if (!um.isManagedProfile(profile.getIdentifier())) {
um = mContext.createContextAsUser(profile, 0 /* flags */)
.getSystemService(UserManager.class);
} catch (IllegalStateException e) {
throw new IllegalArgumentException("Profile does not exist");
}
if (!um.isManagedProfile()) {
throw new IllegalArgumentException("Profile must be a managed profile"); throw new IllegalArgumentException("Profile must be a managed profile");
} }
// Strictly speaking, mOemNetworkPreferences should only be touched on the // Strictly speaking, mOemNetworkPreferences should only be touched on the

1
tests/net/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -578,6 +578,7 @@ public class ConnectivityServiceTest {
final UserManager umMock = createContextAsUser(userHandle, 0 /* flags */) final UserManager umMock = createContextAsUser(userHandle, 0 /* flags */)
.getSystemService(UserManager.class); .getSystemService(UserManager.class);
doReturn(value).when(umMock).isManagedProfile(); doReturn(value).when(umMock).isManagedProfile();
doReturn(value).when(mUserManager).isManagedProfile(eq(userHandle.getIdentifier()));
} }
@Override @Override