Merge "Set the mAccountName as null while device has no any account"

2019-06-14 00:40:59 +00:00
parent b2e2d82c53 2c6d308ecb
commit 8f9afaf99b
2 changed files with 14 additions and 1 deletions
--- a/src/com/android/settings/accounts/AvatarViewMixin.java
+++ b/src/com/android/settings/accounts/AvatarViewMixin.java
@@ -67,7 +67,8 @@ public class AvatarViewMixin implements LifecycleObserver {
    private final MutableLiveData<Bitmap> mAvatarImage;
    private final ActivityManager mActivityManager;

-    private String mAccountName;
+    @VisibleForTesting
+    String mAccountName;

    public AvatarViewMixin(SettingsHomepageActivity activity, ImageView avatarView) {
        mContext = activity.getApplicationContext();
@@ -127,6 +128,7 @@ public class AvatarViewMixin implements LifecycleObserver {
        if (hasAccount()) {
            loadAccount();
        } else {
+            mAccountName = null;
            mAvatarView.setImageResource(R.drawable.ic_account_circle_24dp);
        }
    }