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

Merge "Don't crash in SecondaryUserController." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-04-12 18:57:47 +00:00
committed by Android (Google) Code Review
parent ec7ebc3f72 06470b68e0
commit aa3685fe14
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/deviceinfo/storage/SecondaryUserController.java
View File

@@ -48,6 +48,7 @@ public class SecondaryUserController extends PreferenceController
private @NonNull UserInfo mUser;
private @Nullable StorageItemPreference mStoragePreference;
private Drawable mUserIcon;
private long mSize;
private long mTotalSizeBytes;
@@ -113,6 +114,7 @@ public class SecondaryUserController extends PreferenceController
group.setVisible(true);
group.addPreference(mStoragePreference);
maybeSetIcon();
}
}
@@ -163,9 +165,13 @@ public class SecondaryUserController extends PreferenceController
@Override
public void handleUserIcons(SparseArray<Drawable> fetchedIcons) {
Drawable userIcon = fetchedIcons.get(mUser.id);
if (userIcon != null) {
mStoragePreference.setIcon(userIcon);
mUserIcon = fetchedIcons.get(mUser.id);
maybeSetIcon();
}
private void maybeSetIcon() {
if (mUserIcon != null && mStoragePreference != null) {
mStoragePreference.setIcon(mUserIcon);
}
}