commit 19a07d97478e504a9a52d2b97fcf4e9ddf3820fd
author Svetoslav Ganov <svetoslavganov@google.com> Fri Mar 09 16:05:10 2012 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 09 16:05:10 2012 -0800
tree fa96281b47c226b84614f0123826c217ff4d4883
parent dc4bb3fcae3b828a0d0ea82424b2b9e7cda40c5d
parent c6c25f9e28a4de73261106a80ae098347524dd2a

Merge "AccessibilityServiceInfo does not convert correctly feedback type to string."

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
index eae0a4c..b55fda4 100644
--- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
+++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java
@@ -503,26 +503,38 @@
     public static String feedbackTypeToString(int feedbackType) {
         StringBuilder builder = new StringBuilder();
         builder.append("[");
-        while (feedbackType > 0) {
+        while (feedbackType != 0) {
             final int feedbackTypeFlag = 1 << Integer.numberOfTrailingZeros(feedbackType);
             feedbackType &= ~feedbackTypeFlag;
-            if (builder.length() > 1) {
-                builder.append(", ");
-            }
             switch (feedbackTypeFlag) {
                 case FEEDBACK_AUDIBLE:
+                    if (builder.length() > 1) {
+                        builder.append(", ");
+                    }
                     builder.append("FEEDBACK_AUDIBLE");
                     break;
                 case FEEDBACK_HAPTIC:
+                    if (builder.length() > 1) {
+                        builder.append(", ");
+                    }
                     builder.append("FEEDBACK_HAPTIC");
                     break;
                 case FEEDBACK_GENERIC:
+                    if (builder.length() > 1) {
+                        builder.append(", ");
+                    }
                     builder.append("FEEDBACK_GENERIC");
                     break;
                 case FEEDBACK_SPOKEN:
+                    if (builder.length() > 1) {
+                        builder.append(", ");
+                    }
                     builder.append("FEEDBACK_SPOKEN");
                     break;
                 case FEEDBACK_VISUAL:
+                    if (builder.length() > 1) {
+                        builder.append(", ");
+                    }
                     builder.append("FEEDBACK_VISUAL");
                     break;
             }