diff options
| author | 2017-04-28 20:30:25 -0700 | |
|---|---|---|
| committer | 2017-04-28 20:35:06 -0700 | |
| commit | cb75b5454b54f7d443f1552adb7813ca139d22e3 (patch) | |
| tree | 34b6f95e75e008abb614baba404ae5756a5b4361 | |
| parent | e15f91276c7af4b8c064aa33518519603d494bb2 (diff) | |
Change String to CharSequence in #loadSummary.
Per API council review, localized strings should return CharSequence. Also
updated doc.
Test: ag/1813674
Bug: 37723508
Change-Id: I5ae868c2dda64d3756ad477578c65708242fde8c
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/accessibilityservice/AccessibilityServiceInfo.java | 5 |
4 files changed, 6 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index da601e1519a8..535f63745dc1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -2830,7 +2830,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_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 diff --git a/api/system-current.txt b/api/system-current.txt index 21fce319ebe9..cf4b39c41016 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -2955,7 +2955,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_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 diff --git a/api/test-current.txt b/api/test-current.txt index bd2fed09c9d6..8a64c74dd457 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -2830,7 +2830,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_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 5937dd951dc4..b2c28004f2a1 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -693,9 +693,10 @@ public class AccessibilityServiceInfo implements Parcelable { * <strong>Statically set from * {@link AccessibilityService#SERVICE_META_DATA meta-data}.</strong> * </p> - * @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; } |