Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Inter process interrogation ocassionally gets stuck."

Browse Source
This commit is contained in:
Svetoslav Ganov
2011-09-09 18:57:35 -07:00
committed by Android (Google) Code Review
parent dbed072251 6bc5e53001
commit fd19906b50
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/view/accessibility/AccessibilityInteractionClient.java
View File

@@ -104,6 +104,7 @@ public final class AccessibilityInteractionClient
public void setSameThreadMessage(Message message) { public void setSameThreadMessage(Message message) {
synchronized (mInstanceLock) { synchronized (mInstanceLock) {
mSameThreadMessage = message; mSameThreadMessage = message;
mInstanceLock.notifyAll();
} }
} }
@@ -125,7 +126,6 @@ public final class AccessibilityInteractionClient
Thread.currentThread().getId()); Thread.currentThread().getId());
// If the scale is zero the call has failed. // If the scale is zero the call has failed.
if (windowScale > 0) { if (windowScale > 0) {
handleSameThreadMessageIfNeeded();
AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear( AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(
interactionId); interactionId);
finalizeAccessibilityNodeInfo(info, connection, windowScale); finalizeAccessibilityNodeInfo(info, connection, windowScale);
@@ -142,7 +142,7 @@ public final class AccessibilityInteractionClient
* in the currently active window and starts from the root View in the window. * in the currently active window and starts from the root View in the window.
* *
* @param connection A connection for interacting with the system. * @param connection A connection for interacting with the system.
* @param id The id of the node. * @param viewId The id of the view.
* @return An {@link AccessibilityNodeInfo} if found, null otherwise. * @return An {@link AccessibilityNodeInfo} if found, null otherwise.
*/ */
public AccessibilityNodeInfo findAccessibilityNodeInfoByViewIdInActiveWindow( public AccessibilityNodeInfo findAccessibilityNodeInfoByViewIdInActiveWindow(
@@ -153,7 +153,6 @@ public final class AccessibilityInteractionClient
viewId, interactionId, this, Thread.currentThread().getId()); viewId, interactionId, this, Thread.currentThread().getId());
// If the scale is zero the call has failed. // If the scale is zero the call has failed.
if (windowScale > 0) { if (windowScale > 0) {
handleSameThreadMessageIfNeeded();
AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear( AccessibilityNodeInfo info = getFindAccessibilityNodeInfoResultAndClear(
interactionId); interactionId);
finalizeAccessibilityNodeInfo(info, connection, windowScale); finalizeAccessibilityNodeInfo(info, connection, windowScale);
@@ -182,7 +181,6 @@ public final class AccessibilityInteractionClient
text, interactionId, this, Thread.currentThread().getId()); text, interactionId, this, Thread.currentThread().getId());
// If the scale is zero the call has failed. // If the scale is zero the call has failed.
if (windowScale > 0) { if (windowScale > 0) {
handleSameThreadMessageIfNeeded();
List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear( List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(
interactionId); interactionId);
finalizeAccessibilityNodeInfos(infos, connection, windowScale); finalizeAccessibilityNodeInfos(infos, connection, windowScale);
@@ -217,7 +215,6 @@ public final class AccessibilityInteractionClient
Thread.currentThread().getId()); Thread.currentThread().getId());
// If the scale is zero the call has failed. // If the scale is zero the call has failed.
if (windowScale > 0) { if (windowScale > 0) {
handleSameThreadMessageIfNeeded();
List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear( List<AccessibilityNodeInfo> infos = getFindAccessibilityNodeInfosResultAndClear(
interactionId); interactionId);
finalizeAccessibilityNodeInfos(infos, connection, windowScale); finalizeAccessibilityNodeInfos(infos, connection, windowScale);
@@ -246,7 +243,6 @@ public final class AccessibilityInteractionClient
accessibilityWindowId, accessibilityViewId, action, interactionId, this, accessibilityWindowId, accessibilityViewId, action, interactionId, this,
Thread.currentThread().getId()); Thread.currentThread().getId());
if (success) { if (success) {
handleSameThreadMessageIfNeeded();
return getPerformAccessibilityActionResult(interactionId); return getPerformAccessibilityActionResult(interactionId);
} }
} catch (RemoteException re) { } catch (RemoteException re) {
@@ -363,6 +359,11 @@ public final class AccessibilityInteractionClient
final long startTimeMillis = SystemClock.uptimeMillis(); final long startTimeMillis = SystemClock.uptimeMillis();
while (true) { while (true) {
try { try {
Message sameProcessMessage = getSameProcessMessageAndClear();
if (sameProcessMessage != null) {
sameProcessMessage.getTarget().handleMessage(sameProcessMessage);
}
if (mInteractionId == interactionId) { if (mInteractionId == interactionId) {
return true; return true;
} }
@@ -401,17 +402,6 @@ public final class AccessibilityInteractionClient
info.setBoundsInScreen(bounds); info.setBoundsInScreen(bounds);
} }
/**
* Handles the message stored if the interacted and interacting
* threads are the same otherwise this is a NOP.
*/
private void handleSameThreadMessageIfNeeded() {
Message sameProcessMessage = getSameProcessMessageAndClear();
if (sameProcessMessage != null) {
sameProcessMessage.getTarget().handleMessage(sameProcessMessage);
}
}
/** /**
* Finalize an {@link AccessibilityNodeInfo} before passing it to the client. * Finalize an {@link AccessibilityNodeInfo} before passing it to the client.
* *