Merge "Do not show a summary in Tail button preferences if no app found" into udc-qpr-dev

src/com/android/settings/connecteddevice/stylus/StylusDevicesController.java

@@ -124,7 +124,7 @@ public class StylusDevicesController extends AbstractPreferenceController implem
         try {
             ApplicationInfo ai = pm.getApplicationInfo(packageName,
                     PackageManager.ApplicationInfoFlags.of(0));
-            appName = ai == null ? packageName : pm.getApplicationLabel(ai).toString();
+            appName = ai == null ? "" : pm.getApplicationLabel(ai).toString();
         } catch (PackageManager.NameNotFoundException e) {
             Log.e(TAG, "Notes role package not found.");
         }

tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusDevicesControllerTest.java

@@ -272,6 +272,20 @@ public class StylusDevicesControllerTest {
                         NOTES_APP_LABEL.toString()));
     }
 
+    @Test
+    public void defaultNotesPreference_noApplicationInfo_showsBlankSummary()
+            throws PackageManager.NameNotFoundException {
+        when(mPm.getApplicationInfo(eq(NOTES_PACKAGE_NAME),
+                any(PackageManager.ApplicationInfoFlags.class))).thenReturn(null);
+
+        showScreen(mController);
+
+        Preference defaultNotesPref = mPreferenceContainer.getPreference(0);
+        assertThat(defaultNotesPref.getTitle().toString()).isEqualTo(
+                mContext.getString(R.string.stylus_default_notes_app));
+        assertThat(defaultNotesPref.getSummary().toString()).isEqualTo("");
+    }
+
     @Test
     public void defaultNotesPreference_roleHolderChanges_updatesPreference() {
         showScreen(mController);