PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Replaced removeUserOrSetEphemeral by removeUserWhenPossible"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-01-19 02:59:45 +00:00
committed by Android (Google) Code Review
parent 57c8c2e3bf d228248738
commit 5a7d596259
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/users/UserSettings.java
View File

@@ -814,8 +814,8 @@ public class UserSettings extends SettingsPreferenceFragment
} }
try { try {
getContext().getSystemService(UserManager.class) getContext().getSystemService(UserManager.class)
.removeUserOrSetEphemeral(UserHandle.myUserId(), .removeUserWhenPossible(UserHandle.of(UserHandle.myUserId()),
/* evenWhenDisallowed= */ false); /* overrideDevicePolicy= */ false);
ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM); ActivityManager.getService().switchUser(UserHandle.USER_SYSTEM);
} catch (RemoteException re) { } catch (RemoteException re) {
Log.e(TAG, "Unable to remove self user"); Log.e(TAG, "Unable to remove self user");