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

Merge "Avoid NPE when screen title is null" into rvc-dev am: c8e0d2e755

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11882411

Change-Id: Ib3c4bc91cc51a409b29455e4f00bc423b389a709
This commit is contained in:
Yanting Yang
2020-06-18 10:21:11 +00:00
committed by Automerger Merge Worker
parent dae8a5bff1 c8e0d2e755
commit bdbcd02a09
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/slices/SliceBuilderUtils.java
View File

@@ -220,9 +220,11 @@ public class SliceBuilderUtils {
public static Intent getContentIntent(Context context, SliceData sliceData) { public static Intent getContentIntent(Context context, SliceData sliceData) {
final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build(); final Uri contentUri = new Uri.Builder().appendPath(sliceData.getKey()).build();
final String screenTitle = TextUtils.isEmpty(sliceData.getScreenTitle()) ? null
: sliceData.getScreenTitle().toString();
final Intent intent = buildSearchResultPageIntent(context, final Intent intent = buildSearchResultPageIntent(context,
sliceData.getFragmentClassName(), sliceData.getKey(), sliceData.getFragmentClassName(), sliceData.getKey(),
sliceData.getScreenTitle().toString(), 0 /* TODO */); screenTitle, 0 /* TODO */);
intent.setClassName(context.getPackageName(), SubSettings.class.getName()); intent.setClassName(context.getPackageName(), SubSettings.class.getName());
intent.setData(contentUri); intent.setData(contentUri);
return intent; return intent;
@@ -399,7 +401,8 @@ public class SliceBuilderUtils {
keywords.add(data.getTitle()); keywords.add(data.getTitle());
if (!TextUtils.equals(data.getTitle(), data.getScreenTitle())) { if (!TextUtils.isEmpty(data.getScreenTitle())
&& !TextUtils.equals(data.getTitle(), data.getScreenTitle())) {
keywords.add(data.getScreenTitle().toString()); keywords.add(data.getScreenTitle().toString());
} }