Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop throwing if the label is null" into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-04-20 21:55:57 +00:00
committed by Android (Google) Code Review
parent 952b75ea3f e94630b67f
commit 6b23dfbd0b
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SystemUI/src/com/android/systemui/people/widget/PeopleSpaceWidgetManager.java
View File

@@ -50,6 +50,7 @@ import android.content.SharedPreferences;
import android.content.pm.LauncherApps;
import android.content.pm.PackageManager;
import android.content.pm.ShortcutInfo;
import android.graphics.drawable.Icon;
import android.net.Uri;
import android.os.Bundle;
import android.os.ServiceManager;
@@ -513,24 +514,31 @@ public class PeopleSpaceWidgetManager {
if (DEBUG) Log.d(TAG, "Could not find stored tile to add conversation to");
return;
}
PeopleSpaceTile.Builder updatedTile = storedTile.toBuilder();
ShortcutInfo info = conversation.getShortcutInfo();
Uri uri = null;
if (info.getPersons() != null && info.getPersons().length > 0) {
Person person = info.getPersons()[0];
uri = person.getUri() == null ? null : Uri.parse(person.getUri());
}
storedTile = storedTile.toBuilder()
.setUserName(info.getLabel())
.setUserIcon(
PeopleSpaceTile.convertDrawableToIcon(mLauncherApps.getShortcutIconDrawable(
info, 0)))
CharSequence label = info.getLabel();
if (label != null) {
updatedTile.setUserName(label);
}
Icon icon = PeopleSpaceTile.convertDrawableToIcon(mLauncherApps.getShortcutIconDrawable(
info, 0));
if (icon != null) {
updatedTile.setUserIcon(icon);
}
updatedTile
.setContactUri(uri)
.setStatuses(conversation.getStatuses())
.setLastInteractionTimestamp(conversation.getLastEventTimestamp())
.setIsImportantConversation(conversation.getParentNotificationChannel() != null
&& conversation.getParentNotificationChannel().isImportantConversation())
.build();
updateAppWidgetOptionsAndView(mAppWidgetManager, mContext, appWidgetId, storedTile);
updateAppWidgetOptionsAndView(mAppWidgetManager, mContext, appWidgetId,
updatedTile.build());
}
/**