diff --git a/api/current.txt b/api/current.txt index 265233eabc92e..e3e4d9904d180 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2828,7 +2828,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 diff --git a/api/system-current.txt b/api/system-current.txt index 529f75376da87..1b827951ce819 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2958,7 +2958,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 diff --git a/api/test-current.txt b/api/test-current.txt index 30b35cc46e80b..5d4b08040f61a 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2828,7 +2828,7 @@ package android.accessibilityservice { method public android.content.pm.ResolveInfo getResolveInfo(); method public java.lang.String getSettingsActivityName(); method public java.lang.String loadDescription(android.content.pm.PackageManager); - method public java.lang.String loadSummary(android.content.pm.PackageManager); + method public java.lang.CharSequence loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 70a6ce6157314..06a9b0676d082 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -670,9 +670,10 @@ public class AccessibilityServiceInfo implements Parcelable { * Statically set from * {@link AccessibilityService#SERVICE_META_DATA meta-data}. *

- * @return The localized summary. + * @return The localized summary if available, and {@code null} if a summary + * has not been provided. */ - public String loadSummary(PackageManager packageManager) { + public CharSequence loadSummary(PackageManager packageManager) { if (mSummaryResId == 0) { return mNonLocalizedSummary; }