Merge "Accessibility API in the compat lib should return empty lists and NPE in AccessibilityDelegateCompat." into ics-mr0
diff --git a/v4/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java b/v4/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
index ea3fc87..c403132 100644
--- a/v4/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
+++ b/v4/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
@@ -21,6 +21,7 @@
import android.view.accessibility.AccessibilityManager;
import android.support.v4.view.accessibility.AccessibilityManagerCompatIcs.AccessibilityStateChangeListenerBridge;
+import java.util.Collections;
import java.util.List;
/**
@@ -60,12 +61,12 @@
public List<AccessibilityServiceInfo> getEnabledAccessibilityServiceList(
AccessibilityManager manager, int feedbackTypeFlags) {
- return null;
+ return Collections.emptyList();
}
public List<AccessibilityServiceInfo> getInstalledAccessibilityServiceList(
AccessibilityManager manager) {
- return null;
+ return Collections.emptyList();
}
public boolean isTouchExplorationEnabled(AccessibilityManager manager) {
diff --git a/v4/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java b/v4/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
index 9fd4ddf..c675a2b 100644
--- a/v4/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
+++ b/v4/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
@@ -21,6 +21,7 @@
import android.view.View;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
/**
@@ -100,7 +101,7 @@
}
public List<Object> findAccessibilityNodeInfosByText(Object info, String text) {
- return null;
+ return Collections.emptyList();
}
public int getActions(Object info) {
diff --git a/v4/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java b/v4/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
index a89e18d..19e90ca 100644
--- a/v4/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
+++ b/v4/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
@@ -20,6 +20,7 @@
import android.os.Parcelable;
import android.view.View;
+import java.util.Collections;
import java.util.List;
/**
@@ -141,7 +142,7 @@
}
public List<CharSequence> getText(Object record) {
- return null;
+ return Collections.emptyList();
}
public int getToIndex(Object record) {
