diff between support-package rev.4 and rev.5

gistfile1.diff

diff -u -r rev4-map/src/java/android/support/v4/android/accessibilityservice/AccessibilityServiceInfoCompat.java rev5/src/java/android/support/v4/android/accessibilityservice/AccessibilityServiceInfoCompat.java
--- rev4-map/src/java/android/support/v4/android/accessibilityservice/AccessibilityServiceInfoCompat.java	Tue Dec 13 11:16:56 2011
+++ rev5/src/java/android/support/v4/android/accessibilityservice/AccessibilityServiceInfoCompat.java	Tue Dec 13 11:05:21 2011
@@ -185,22 +185,34 @@
      * @return The string representation.
      */
     public static String feedbackTypeToString(int feedbackType) {
-        switch (feedbackType) {
-            case AccessibilityServiceInfo.FEEDBACK_AUDIBLE:
-                return "FEEDBACK_AUDIBLE";
-            case AccessibilityServiceInfo.FEEDBACK_HAPTIC:
-                return "FEEDBACK_HAPTIC";
-            case AccessibilityServiceInfo.FEEDBACK_GENERIC:
-                return "FEEDBACK_GENERIC";
-            case AccessibilityServiceInfo.FEEDBACK_SPOKEN:
-                return "FEEDBACK_SPOKEN";
-            case AccessibilityServiceInfo.FEEDBACK_VISUAL:
-                return "FEEDBACK_VISUAL";
-            case AccessibilityServiceInfoCompat.FEEDBACK_ALL_MASK:
-                return "FEEDBACK_ALL";
-            default:
-                return null;
+        StringBuilder builder = new StringBuilder();
+        builder.append("[");
+        while (feedbackType > 0) {
+            final int feedbackTypeFlag = 1 << Integer.numberOfTrailingZeros(feedbackType);
+            feedbackType &= ~feedbackTypeFlag;
+            if (builder.length() > 1) {
+                builder.append(", ");
+            }
+            switch (feedbackTypeFlag) {
+                case AccessibilityServiceInfo.FEEDBACK_AUDIBLE:
+                    builder.append("FEEDBACK_AUDIBLE");
+                    break;
+                case AccessibilityServiceInfo.FEEDBACK_HAPTIC:
+                    builder.append("FEEDBACK_HAPTIC");
+                    break;
+                case AccessibilityServiceInfo.FEEDBACK_GENERIC:
+                    builder.append("FEEDBACK_GENERIC");
+                    break;
+                case AccessibilityServiceInfo.FEEDBACK_SPOKEN:
+                    builder.append("FEEDBACK_SPOKEN");
+                    break;
+                case AccessibilityServiceInfo.FEEDBACK_VISUAL:
+                    builder.append("FEEDBACK_VISUAL");
+                    break;
+            }
         }
+        builder.append("]");
+        return builder.toString();
     }
 
     /**
diff -u -r rev4-map/src/java/android/support/v4/app/FragmentActivity.java rev5/src/java/android/support/v4/app/FragmentActivity.java
diff -u -r rev4-map/src/java/android/support/v4/view/AccessibilityDelegateCompat.java rev5/src/java/android/support/v4/view/AccessibilityDelegateCompat.java
--- rev4-map/src/java/android/support/v4/view/AccessibilityDelegateCompat.java	Tue Dec 13 11:16:57 2011
+++ rev5/src/java/android/support/v4/view/AccessibilityDelegateCompat.java	Tue Dec 13 11:05:24 2011
@@ -34,7 +34,8 @@
                 AccessibilityEvent event);
         public void onInitializeAccessibilityEvent(Object delegate, View host,
                 AccessibilityEvent event);
-        public void onInitializeAccessibilityNodeInfo(Object delegate, View host, Object info);
+        public void onInitializeAccessibilityNodeInfo(Object delegate, View host,
+                AccessibilityNodeInfoCompat info);
         public void onPopulateAccessibilityEvent(Object delegate, View host,
                 AccessibilityEvent event);
         public boolean onRequestSendAccessibilityEvent(Object delegate, ViewGroup host, View child,
@@ -63,7 +64,8 @@
 
         }
 
-        public void onInitializeAccessibilityNodeInfo(Object delegate, View host, Object info) {
+        public void onInitializeAccessibilityNodeInfo(Object delegate, View host,
+                AccessibilityNodeInfoCompat info) {
 
         }
 
@@ -151,8 +153,10 @@
         }
 
         @Override
-        public void onInitializeAccessibilityNodeInfo(Object delegate, View host, Object info) {
-            AccessibilityDelegateCompatIcs.onInitializeAccessibilityNodeInfo(delegate, host, info);
+        public void onInitializeAccessibilityNodeInfo(Object delegate, View host,
+                AccessibilityNodeInfoCompat info) {
+            AccessibilityDelegateCompatIcs.onInitializeAccessibilityNodeInfo(delegate, host,
+                    info.getImpl());
         }
 
         @Override
diff -u -r rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java rev5/src/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java
--- rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java	Tue Dec 13 11:16:57 2011
+++ rev5/src/java/android/support/v4/view/accessibility/AccessibilityManagerCompat.java	Tue Dec 13 11:05:24 2011
@@ -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 -u -r rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java rev5/src/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java
--- rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java	Tue Dec 13 11:16:57 2011
+++ rev5/src/java/android/support/v4/view/accessibility/AccessibilityNodeInfoCompat.java	Tue Dec 13 11:05:24 2011
@@ -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 -u -r rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java rev5/src/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java
--- rev4-map/src/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java	Tue Dec 13 11:16:57 2011
+++ rev5/src/java/android/support/v4/view/accessibility/AccessibilityRecordCompat.java	Tue Dec 13 11:05:24 2011
@@ -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) {