commit c8e0d2e755bd189f48ce110893f71b1fb4c1fe20
author Yanting Yang <yantingyang@google.com> Thu Jun 18 09:58:47 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 18 09:58:47 2020 +0000
tree 45e6c3e19063ef7320e5acde70882184eef4885e
parent 52707fce4f9c04759713597a4c70f3e8c36b3ed7
parent 72c2fa5a3d7f6913a387d78b195ad941303f46c6

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

src/com/android/settings/slices/SliceBuilderUtils.java

diff --git a/src/com/android/settings/slices/SliceBuilderUtils.java b/src/com/android/settings/slices/SliceBuilderUtils.java
index 391e9fd..552927e 100644
--- a/src/com/android/settings/slices/SliceBuilderUtils.java
+++ b/src/com/android/settings/slices/SliceBuilderUtils.java
@@ -220,9 +220,11 @@
 
     public static Intent getContentIntent(Context context, SliceData sliceData) {
         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,
                 sliceData.getFragmentClassName(), sliceData.getKey(),
-                sliceData.getScreenTitle().toString(), 0 /* TODO */);
+                screenTitle, 0 /* TODO */);
         intent.setClassName(context.getPackageName(), SubSettings.class.getName());
         intent.setData(contentUri);
         return intent;
@@ -399,7 +401,8 @@
 
         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());
         }