summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Kennedy <skennedy@google.com> 2015-03-06 02:31:28 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2015-03-06 02:31:30 +0000
commit5dc5c0aac8b4caff4854dc4f988e17734b59a20a (patch)
treeaf3a2d2cf00d4436fa128bf6368f6d0a0cff987b
parente51f79975e829d8f4afc77d0e98bad0f5fde73d2 (diff)
parent89809a1cd46a46438d15b83a814e14f790ace048 (diff)
Merge "Mark setAccessibilityDelegate()'s argument as @Nullable"
-rw-r--r--core/java/android/view/View.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index f25b6402c078..4b3765a1228d 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -5849,7 +5849,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
*
* @see AccessibilityDelegate
*/
- public void setAccessibilityDelegate(AccessibilityDelegate delegate) {
+ public void setAccessibilityDelegate(@Nullable AccessibilityDelegate delegate) {
mAccessibilityDelegate = delegate;
}