Merge "In Accessibility code, wrap Binder.restoreCallingIdentity() in finally{}." (2a962f63) · Commits · e / os / android_frameworks_base

core/java/android/view/accessibility/AccessibilityInteractionClient.java

+63 −28

Original line number	Diff line number	Diff line
		@@ -187,8 +187,11 @@ public final class AccessibilityInteractionClient
		Log.i(LOG_TAG, "Window cache miss");
		}
		final long identityToken = Binder.clearCallingIdentity();
		try {
		window = connection.getWindow(accessibilityWindowId);
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}
		if (window != null) {
		sAccessibilityCache.addWindow(window);
		return window;
		@@ -225,8 +228,11 @@ public final class AccessibilityInteractionClient
		Log.i(LOG_TAG, "Windows cache miss");
		}
		final long identityToken = Binder.clearCallingIdentity();
		try {
		windows = connection.getWindows();
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}
		if (windows != null) {
		sAccessibilityCache.setWindows(windows);
		return windows;
		@@ -283,10 +289,14 @@ public final class AccessibilityInteractionClient
		}
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.findAccessibilityNodeInfoByAccessibilityId(
		final boolean success;
		try {
		success = connection.findAccessibilityNodeInfoByAccessibilityId(
		accessibilityWindowId, accessibilityNodeId, interactionId, this,
		prefetchFlags, Thread.currentThread().getId(), arguments);
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}
		if (success) {
		List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(
		interactionId);
		@@ -333,10 +343,15 @@ public final class AccessibilityInteractionClient
		if (connection != null) {
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.findAccessibilityNodeInfosByViewId(
		final boolean success;
		try {
		success = connection.findAccessibilityNodeInfosByViewId(
		accessibilityWindowId, accessibilityNodeId, viewId, interactionId, this,
		Thread.currentThread().getId());
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}

		if (success) {
		List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(
		interactionId);
		@@ -381,10 +396,15 @@ public final class AccessibilityInteractionClient
		if (connection != null) {
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.findAccessibilityNodeInfosByText(
		final boolean success;
		try {
		success = connection.findAccessibilityNodeInfosByText(
		accessibilityWindowId, accessibilityNodeId, text, interactionId, this,
		Thread.currentThread().getId());
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}

		if (success) {
		List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(
		interactionId);
		@@ -428,10 +448,15 @@ public final class AccessibilityInteractionClient
		if (connection != null) {
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.findFocus(accessibilityWindowId,
		final boolean success;
		try {
		success = connection.findFocus(accessibilityWindowId,
		accessibilityNodeId, focusType, interactionId, this,
		Thread.currentThread().getId());
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}

		if (success) {
		AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(
		interactionId);
		@@ -472,10 +497,15 @@ public final class AccessibilityInteractionClient
		if (connection != null) {
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.focusSearch(accessibilityWindowId,
		final boolean success;
		try {
		success = connection.focusSearch(accessibilityWindowId,
		accessibilityNodeId, direction, interactionId, this,
		Thread.currentThread().getId());
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}

		if (success) {
		AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(
		interactionId);
		@@ -515,10 +545,15 @@ public final class AccessibilityInteractionClient
		if (connection != null) {
		final int interactionId = mInteractionIdCounter.getAndIncrement();
		final long identityToken = Binder.clearCallingIdentity();
		final boolean success = connection.performAccessibilityAction(
		final boolean success;
		try {
		success = connection.performAccessibilityAction(
		accessibilityWindowId, accessibilityNodeId, action, arguments,
		interactionId, this, Thread.currentThread().getId());
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}

		if (success) {
		return getPerformAccessibilityActionResultAndClear(interactionId);
		}

core/java/android/view/accessibility/AccessibilityManager.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -436,8 +436,11 @@ public final class AccessibilityManager {
		// client using it is called through Binder from another process. Example: MMS
		// app adds a SMS notification and the NotificationManagerService calls this method
		long identityToken = Binder.clearCallingIdentity();
		try {
		service.sendAccessibilityEvent(event, userId);
		} finally {
		Binder.restoreCallingIdentity(identityToken);
		}
		if (DEBUG) {
		Log.i(LOG_TAG, event + " sent");
		}