diff options
| author | Phil Weaver <pweaver@google.com> | 2016-06-09 10:24:53 -0700 |
|---|---|---|
| committer | Phil Weaver <pweaver@google.com> | 2016-06-09 13:45:46 -0700 |
| commit | 155edc693eecb64d821a95567e719d0de7ee9c85 (patch) | |
| tree | cc386d8e1831ac2314089de356fae2b5be242995 /core/java/android | |
| parent | e5417a3863a6950a55fd4e3d8f50da5d2321ae3c (diff) | |
Improve accessibility window title behavior
Un-reverts ag/1057448, but uses a version of Resources#getText
that returns null rather than throw an exception when no title
is available. This is the same call made before, so this change
should be safer.
Bug: 28744278
Change-Id: I8c123f4f6d74f796ab9e8ffcf955aaf881770da1
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/view/accessibility/AccessibilityWindowInfo.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java index d0d4507e7b62..52f35de7e189 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java @@ -16,6 +16,7 @@ package android.view.accessibility; +import android.annotation.Nullable; import android.graphics.Rect; import android.os.Parcel; import android.os.Parcelable; @@ -101,8 +102,9 @@ public final class AccessibilityWindowInfo implements Parcelable { /** * Gets the title of the window. * - * @return The title. + * @return The title of the window, or {@code null} if none is available. */ + @Nullable public CharSequence getTitle() { return mTitle; } |