commit ad597344a258556d1c591c5083ddf0db1dcb69d3
author Jeff Sharkey <jsharkey@google.com> Mon May 01 17:52:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon May 01 17:52:27 2017 +0000
tree 7e7a3b4ca15afc7024dd0a48cf821be76a6c22dc
parent b2d85af91e1d3a33dd80def07d6f45f14b20860a
parent 2cc818acceb372fc6d99b8404d52c0128614d723

Merge "Change String to CharSequence in #loadSummary." into oc-dev

src/com/android/settings/accessibility/AccessibilitySettings.java

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 44dd353..eb3e726 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -478,7 +478,7 @@
             final String serviceState = serviceEnabled ?
                     getString(R.string.accessibility_summary_state_enabled) :
                     getString(R.string.accessibility_summary_state_disabled);
-            final String serviceSummary = info.loadSummary(getPackageManager());
+            final CharSequence serviceSummary = info.loadSummary(getPackageManager());
             final String stateSummaryCombo = getString(
                     R.string.accessibility_summary_default_combination,
                     serviceState, serviceSummary);

src/com/android/settings/accessibility/ShortcutServicePickerFragment.java

diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 3250521..d7749ea 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -69,7 +69,7 @@
             candidates.add(new DefaultAppInfo(mPm,
                     UserHandle.myUserId(),
                     installedServiceInfo.getComponentName(),
-                    installedServiceInfo.loadSummary(mPm.getPackageManager()),
+                    (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
                     true /* enabled */));
         }