Merge "Don't request profile owner as user if we don't have a valid user" (50f91361) · Commits · e / os / android_frameworks_base

packages/SettingsLib/src/com/android/settingslib/drawable/UserIconDrawable.java

+7 −5

Original line number	Diff line number	Diff line
		@@ -172,12 +172,14 @@ public class UserIconDrawable extends Drawable implements Drawable.Callback {

		public UserIconDrawable setBadgeIfManagedUser(Context context, int userId) {
		Drawable badge = null;
		if (userId != UserHandle.USER_NULL) {
		boolean isManaged = context.getSystemService(DevicePolicyManager.class)
		.getProfileOwnerAsUser(userId) != null;
		if (isManaged) {
		badge = getDrawableForDisplayDensity(
		context, com.android.internal.R.drawable.ic_corp_badge_case);
		}
		}
		return setBadge(badge);
		}

+3 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ import com.android.internal.util.UserIcons;
		import com.android.settingslib.RestrictedLockUtilsInternal;
		import com.android.settingslib.Utils;
		import com.android.systemui.Dependency;
		import com.android.systemui.Dumpable;
		import com.android.systemui.GuestResumeSessionReceiver;
		import com.android.systemui.Prefs;
		import com.android.systemui.Prefs.Key;
		@@ -70,7 +71,7 @@ import java.util.List;
		/**
		* Keeps a list of all users on the device for user switching.
		*/
		public class UserSwitcherController {
		public class UserSwitcherController implements Dumpable {

		private static final String TAG = "UserSwitcherController";
		private static final boolean DEBUG = false;
		@@ -549,6 +550,7 @@ public class UserSwitcherController {
		};
		};

		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println("UserSwitcherController state:");
		pw.println(" mLastNonGuestUser=" + mLastNonGuestUser);