Merge "AccessibilityServiceInfo does not convert correctly feedback type to string." (19a07d97) · Commits · e / os / android_frameworks_base

core/java/android/accessibilityservice/AccessibilityServiceInfo.java

+16 −4

Original line number	Diff line number	Diff line
		@@ -503,26 +503,38 @@ public class AccessibilityServiceInfo implements Parcelable {
		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;
		switch (feedbackTypeFlag) {
		case FEEDBACK_AUDIBLE:
		if (builder.length() > 1) {
		builder.append(", ");
		}
		switch (feedbackTypeFlag) {
		case FEEDBACK_AUDIBLE:
		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;
		}