Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Should not switch to a user with removal in progress"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-08 05:43:29 +00:00
committed by Android (Google) Code Review
parent 0e4965517e 84181f7db7
commit 26e228da83
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/content/pm/UserInfo.java
View File

@@ -366,8 +366,9 @@ public class UserInfo implements Parcelable {
* @return true if this user can be switched to.
**/
public boolean supportsSwitchTo() {
if (isEphemeral() && !isEnabled()) {
// Don't support switching to an ephemeral user with removal in progress.
if (partial || !isEnabled()) {
// Don't support switching to disabled or partial users, which includes users with
// removal in progress.
return false;
}
if (preCreated) {

18
services/tests/servicestests/src/com/android/server/pm/UserManagerServiceUserInfoTest.java
View File

@@ -17,6 +17,7 @@
package com.android.server.pm;
import static android.content.pm.UserInfo.FLAG_DEMO;
import static android.content.pm.UserInfo.FLAG_DISABLED;
import static android.content.pm.UserInfo.FLAG_EPHEMERAL;
import static android.content.pm.UserInfo.FLAG_FULL;
import static android.content.pm.UserInfo.FLAG_GUEST;
@@ -166,6 +167,23 @@ public class UserManagerServiceUserInfoTest {
assertTrue(mUserManagerService.isUserOfType(testId, typeName));
}
/** Test UserInfo.supportsSwitchTo() for partial user. */
@Test
public void testSupportSwitchTo_partial() throws Exception {
UserInfo userInfo = createUser(100, FLAG_FULL, null);
userInfo.partial = true;
assertFalse("Switching to a partial user should be disabled",
userInfo.supportsSwitchTo());
}
/** Test UserInfo.supportsSwitchTo() for disabled user. */
@Test
public void testSupportSwitchTo_disabled() throws Exception {
UserInfo userInfo = createUser(100, FLAG_DISABLED, null);
assertFalse("Switching to a DISABLED user should be disabled",
userInfo.supportsSwitchTo());
}
/** Test UserInfo.supportsSwitchTo() for precreated users. */
@Test
public void testSupportSwitchTo_preCreated() throws Exception {