Adding dump support for the accessibility manager service. (6ce77cdd) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityEvent.java

+169 −47

Original line number	Diff line number	Diff line
		@@ -1137,54 +1137,176 @@ public final class AccessibilityEvent extends AccessibilityRecord implements Par
		* @return The string representation.
		*/
		public static String eventTypeToString(int eventType) {
		switch (eventType) {
		case TYPE_VIEW_CLICKED:
		return "TYPE_VIEW_CLICKED";
		case TYPE_VIEW_LONG_CLICKED:
		return "TYPE_VIEW_LONG_CLICKED";
		case TYPE_VIEW_SELECTED:
		return "TYPE_VIEW_SELECTED";
		case TYPE_VIEW_FOCUSED:
		return "TYPE_VIEW_FOCUSED";
		case TYPE_VIEW_TEXT_CHANGED:
		return "TYPE_VIEW_TEXT_CHANGED";
		case TYPE_WINDOW_STATE_CHANGED:
		return "TYPE_WINDOW_STATE_CHANGED";
		case TYPE_VIEW_HOVER_ENTER:
		return "TYPE_VIEW_HOVER_ENTER";
		case TYPE_VIEW_HOVER_EXIT:
		return "TYPE_VIEW_HOVER_EXIT";
		case TYPE_NOTIFICATION_STATE_CHANGED:
		return "TYPE_NOTIFICATION_STATE_CHANGED";
		case TYPE_TOUCH_EXPLORATION_GESTURE_START:
		return "TYPE_TOUCH_EXPLORATION_GESTURE_START";
		case TYPE_TOUCH_EXPLORATION_GESTURE_END:
		return "TYPE_TOUCH_EXPLORATION_GESTURE_END";
		case TYPE_WINDOW_CONTENT_CHANGED:
		return "TYPE_WINDOW_CONTENT_CHANGED";
		case TYPE_VIEW_TEXT_SELECTION_CHANGED:
		return "TYPE_VIEW_TEXT_SELECTION_CHANGED";
		case TYPE_VIEW_SCROLLED:
		return "TYPE_VIEW_SCROLLED";
		case TYPE_ANNOUNCEMENT:
		return "TYPE_ANNOUNCEMENT";
		case TYPE_VIEW_ACCESSIBILITY_FOCUSED:
		return "TYPE_VIEW_ACCESSIBILITY_FOCUSED";
		case TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED:
		return "TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED";
		case TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY:
		return "TYPE_CURRENT_AT_GRANULARITY_MOVEMENT_CHANGED";
		case TYPE_GESTURE_DETECTION_START:
		return "TYPE_GESTURE_DETECTION_START";
		case TYPE_GESTURE_DETECTION_END:
		return "TYPE_GESTURE_DETECTION_END";
		case TYPE_TOUCH_INTERACTION_START:
		return "TYPE_TOUCH_INTERACTION_START";
		case TYPE_TOUCH_INTERACTION_END:
		return "TYPE_TOUCH_INTERACTION_END";
		default:
		return null;
		if (eventType == TYPES_ALL_MASK) {
		return "TYPES_ALL_MASK";
		}
		StringBuilder builder = new StringBuilder();
		int eventTypeCount = 0;
		while (eventType != 0) {
		final int eventTypeFlag = 1 << Integer.numberOfTrailingZeros(eventType);
		eventType &= ~eventTypeFlag;
		switch (eventTypeFlag) {
		case TYPE_VIEW_CLICKED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_CLICKED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_LONG_CLICKED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_LONG_CLICKED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_SELECTED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_SELECTED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_FOCUSED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_FOCUSED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_TEXT_CHANGED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_TEXT_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_WINDOW_STATE_CHANGED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_WINDOW_STATE_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_HOVER_ENTER: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_HOVER_ENTER");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_HOVER_EXIT: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_HOVER_EXIT");
		eventTypeCount++;
		} break;
		case TYPE_NOTIFICATION_STATE_CHANGED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_NOTIFICATION_STATE_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_TOUCH_EXPLORATION_GESTURE_START: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_TOUCH_EXPLORATION_GESTURE_START");
		eventTypeCount++;
		} break;
		case TYPE_TOUCH_EXPLORATION_GESTURE_END: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_TOUCH_EXPLORATION_GESTURE_END");
		eventTypeCount++;
		} break;
		case TYPE_WINDOW_CONTENT_CHANGED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_WINDOW_CONTENT_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_TEXT_SELECTION_CHANGED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_TEXT_SELECTION_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_SCROLLED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_SCROLLED");
		eventTypeCount++;
		} break;
		case TYPE_ANNOUNCEMENT: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_ANNOUNCEMENT");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_ACCESSIBILITY_FOCUSED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_ACCESSIBILITY_FOCUSED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_VIEW_ACCESSIBILITY_FOCUS_CLEARED");
		eventTypeCount++;
		} break;
		case TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_CURRENT_AT_GRANULARITY_MOVEMENT_CHANGED");
		eventTypeCount++;
		} break;
		case TYPE_GESTURE_DETECTION_START: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_GESTURE_DETECTION_START");
		eventTypeCount++;
		} break;
		case TYPE_GESTURE_DETECTION_END: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_GESTURE_DETECTION_END");
		eventTypeCount++;
		} break;
		case TYPE_TOUCH_INTERACTION_START: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_TOUCH_INTERACTION_START");
		eventTypeCount++;
		} break;
		case TYPE_TOUCH_INTERACTION_END: {
		if (eventTypeCount > 0) {
		builder.append(", ");
		}
		builder.append("TYPE_TOUCH_INTERACTION_END");
		eventTypeCount++;
		} break;
		}
		}
		if (eventTypeCount > 1) {
		builder.insert(0, '[');
		builder.append(']');
		}
		return builder.toString();
		}

		/**

services/java/com/android/server/accessibility/AccessibilityManagerService.java

+63 −1

Original line number	Diff line number	Diff line
		@@ -87,7 +87,9 @@ import com.android.internal.statusbar.IStatusBarService;

		import org.xmlpull.v1.XmlPullParserException;

		import java.io.FileDescriptor;
		import java.io.IOException;
		import java.io.PrintWriter;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.HashMap;
		@@ -122,6 +124,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		private static final String TEMPORARY_ENABLE_ACCESSIBILITY_UNTIL_KEYGUARD_REMOVED =
		"temporaryEnableAccessibilityStateUntilKeyguardRemoved";

		private static final String FUNCTION_DUMP = "dump";

		private static final char COMPONENT_NAME_SEPARATOR = ':';

		private static final int OWN_PROCESS_ID = android.os.Process.myPid();
		@@ -1258,6 +1262,46 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}
		}

		@Override
		public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {
		mSecurityPolicy.enforceCallingPermission(Manifest.permission.DUMP, FUNCTION_DUMP);
		synchronized (mLock) {
		pw.println("ACCESSIBILITY MANAGER (dumpsys accessibility)");
		pw.println();
		pw.println("Ui automation service: bound=" + (mUiAutomationService != null));
		pw.println();
		if (mUiAutomationService != null) {
		mUiAutomationService.dump(fd, pw, args);
		pw.println();
		}
		final int userCount = mUserStates.size();
		for (int i = 0; i < userCount; i++) {
		UserState userState = mUserStates.valueAt(i);
		pw.append("User state[attributes:{id=" + userState.mUserId);
		pw.append(", currentUser=" + (userState.mUserId == mCurrentUserId));
		pw.append(", accessibilityEnabled=" + userState.mIsAccessibilityEnabled);
		pw.append(", touchExplorationEnabled=" + userState.mIsTouchExplorationEnabled);
		pw.append(", displayMagnificationEnabled="
		+ userState.mIsDisplayMagnificationEnabled);
		pw.append("}");
		pw.println();
		pw.append(" services:{");
		final int serviceCount = userState.mServices.size();
		for (int j = 0; j < serviceCount; j++) {
		if (j > 0) {
		pw.append(", ");
		pw.println();
		pw.append(" ");
		}
		Service service = userState.mServices.get(j);
		service.dump(fd, pw, args);
		}
		pw.println("}]");
		pw.println();
		}
		}
		}

		private class AccessibilityConnectionWrapper implements DeathRecipient {
		private final int mWindowId;
		private final int mUserId;
		@@ -1894,6 +1938,23 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}
		}

		@Override
		public void dump(FileDescriptor fd, final PrintWriter pw, String[] args) {
		mSecurityPolicy.enforceCallingPermission(Manifest.permission.DUMP, FUNCTION_DUMP);
		synchronized (mLock) {
		pw.append("Service[label=" + mAccessibilityServiceInfo.getResolveInfo()
		.loadLabel(mContext.getPackageManager()));
		pw.append(", feedbackType"
		+ AccessibilityServiceInfo.feedbackTypeToString(mFeedbackType));
		pw.append(", canRetrieveScreenContent=" + mCanRetrieveScreenContent);
		pw.append(", eventTypes="
		+ AccessibilityEvent.eventTypeToString(mEventTypes));
		pw.append(", notificationTimeout=" + mNotificationTimeout);
		pw.append("]");
		}
		}

		@Override
		public void onServiceDisconnected(ComponentName componentName) {
		/* do nothing - #binderDied takes care */
		}
		@@ -2313,7 +2374,8 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
		}
		if (!hasPermission(permission)) {
		throw new SecurityException("You do not have " + permission
		+ " required to call " + function);
		+ " required to call " + function + " from pid="
		+ Binder.getCallingPid() + ", uid=" + Binder.getCallingUid());
		}
		}