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

Remove unnecessary flag check

Browse Source 
This code is to remove the user which shouldn't be shown when in quiet
mode - if anything, it's better to keep this not behind the flag.

Also, the user property is not behind the flag.

Bug: 312976400
Test: manual
Change-Id: Ic66a53bf7608848df223914b0fe78ed00b86db70
This commit is contained in:
Manish Singh
2023-11-27 17:31:06 +00:00
parent 51f1321b1e
commit eaafcbcb28
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/dashboard/profileselector/ProfileSelectDialog.java
View File

@@ -27,7 +27,6 @@ import android.content.Intent;
import android.content.pm.UserInfo; import android.content.pm.UserInfo;
import android.content.pm.UserProperties; import android.content.pm.UserProperties;
import android.os.Bundle; import android.os.Bundle;
import android.os.Flags;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.Log; import android.util.Log;
@@ -187,8 +186,7 @@ public class ProfileSelectDialog extends DialogFragment implements UserAdapter.O
UserInfo userInfo = userManager.getUserInfo(userHandles.get(i).getIdentifier()); UserInfo userInfo = userManager.getUserInfo(userHandles.get(i).getIdentifier());
if (userInfo == null if (userInfo == null
|| userInfo.isCloneProfile() || userInfo.isCloneProfile()
|| (Flags.allowPrivateProfile() || shouldHideUserInQuietMode(userHandles.get(i), userManager)) {
&& shouldHideUserInQuietMode(userHandles.get(i), userManager))) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Delete the user: " + userHandles.get(i).getIdentifier()); Log.d(TAG, "Delete the user: " + userHandles.get(i).getIdentifier());
} }
@@ -221,8 +219,7 @@ public class ProfileSelectDialog extends DialogFragment implements UserAdapter.O
UserInfo userInfo = userManager.getUserInfo(userHandle.getIdentifier()); UserInfo userInfo = userManager.getUserInfo(userHandle.getIdentifier());
if (userInfo == null if (userInfo == null
|| userInfo.isCloneProfile() || userInfo.isCloneProfile()
|| (Flags.allowPrivateProfile() || shouldHideUserInQuietMode(userHandle, userManager)) {
&& shouldHideUserInQuietMode(userHandle, userManager))) {
if (DEBUG) { if (DEBUG) {
Log.d(TAG, "Delete the user: " + userHandle.getIdentifier()); Log.d(TAG, "Delete the user: " + userHandle.getIdentifier());
} }