From d0b3d1a11cfd063495405c97669864359ab56984 Mon Sep 17 00:00:00 2001 From: Alison Cichowlas Date: Wed, 8 Jul 2020 14:27:35 -0400 Subject: [PATCH] Call toString instead of casting. Fixes: 142704267 Test: check for crashes with apk using labeledintent Change-Id: I98108a4cd6280066eec009abadf0eb889974a5b6 --- core/java/com/android/internal/app/ResolverListAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/com/android/internal/app/ResolverListAdapter.java b/core/java/com/android/internal/app/ResolverListAdapter.java index eef722e32bdcd..c16ee42f49269 100644 --- a/core/java/com/android/internal/app/ResolverListAdapter.java +++ b/core/java/com/android/internal/app/ResolverListAdapter.java @@ -833,7 +833,7 @@ public class ResolverListAdapter extends BaseAdapter { String getAppSubLabelInternal() { // Will default to app name if no intent filter or activity label set, make sure to // check if subLabel matches label before final display - return (String) mRi.loadLabel(mPm); + return mRi.loadLabel(mPm).toString(); } }