Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e686f52d authored by Chris Antol's avatar Chris Antol Committed by Automerger Merge Worker
Browse files

Merge "Hide accounts of users that should not be shown" into main am: 8595d951 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2898064



Change-Id: I3e0fe00eca5c30127a38a1e7cd36c22ec7666de6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fd725081 8595d951

src/com/android/settings/accounts/AccountPreferenceController.java

+5 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import android.content.IntentFilter; 
import android.content.pm.ApplicationInfo;

import android.content.pm.PackageManager;

import android.content.pm.UserInfo;

import android.content.pm.UserProperties;

import android.content.res.Resources;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -336,6 +337,10 @@ public class AccountPreferenceController extends AbstractPreferenceController 
            }

            return;

        }

        if (mUm.getUserProperties(userInfo.getUserHandle()).getShowInSettings()

                == UserProperties.SHOW_IN_SETTINGS_NO) {

            return;

        }

        final Context context = mContext;

        final ProfileData profileData = new ProfileData();

        profileData.userInfo = userInfo;