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

am 407ce197: am 3003bada: Merge "Check whether ChromeVox is ready before attempting to call it." into jb-mr1-dev

Browse Source 
* commit '407ce197e82781759e92648c5a72bb4ecefa920b':
  Check whether ChromeVox is ready before attempting to call it.
This commit is contained in:
Svetoslav Ganov
2012-10-11 17:27:14 -07:00
committed by Android Git Automerger
parent 78c12209b6 407ce197e8
commit ef5f50a418
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/java/android/webkit/AccessibilityInjector.java
View File

@@ -96,11 +96,26 @@ class AccessibilityInjector {
// Template for JavaScript that performs AndroidVox actions.
private static final String ACCESSIBILITY_ANDROIDVOX_TEMPLATE =
"cvox.AndroidVox.performAction('%1s')";
"(function() {" +
" if ((typeof(cvox) != 'undefined')"+
" && (typeof(cvox.ChromeVox) != 'undefined')" +
" && (typeof(cvox.AndroidVox) != 'undefined')" +
" && cvox.ChromeVox.isActive) {" +
" return cvox.AndroidVox.performAction('%1s');" +
" } else {" +
" return false;" +
" }" +
"})()";
// JS code used to shut down an active AndroidVox instance.
private static final String TOGGLE_CVOX_TEMPLATE =
"javascript:(function() { cvox.ChromeVox.host.activateOrDeactivateChromeVox(%b); })();";
"javascript:(function() {" +
" if ((typeof(cvox) != 'undefined')"+
" && (typeof(cvox.ChromeVox) != 'undefined')" +
" && (typeof(cvox.ChromeVox.host) != 'undefined')) {" +
" cvox.ChromeVox.host.activateOrDeactivateChromeVox(%b);" +
" }" +
"})();";
/**
* Creates an instance of the AccessibilityInjector based on
@@ -776,20 +791,26 @@ class AccessibilityInjector {
while (true) {
try {
if (mResultId == resultId) {
if (DEBUG)
Log.w(TAG, "Received CVOX result");
return true;
}
if (mResultId > resultId) {
if (DEBUG)
Log.w(TAG, "Obsolete CVOX result");
return false;
}
final long elapsedTimeMillis = SystemClock.uptimeMillis() - startTimeMillis;
waitTimeMillis = RESULT_TIMEOUT - elapsedTimeMillis;
if (waitTimeMillis <= 0) {
if (DEBUG)
Log.w(TAG, "Timed out while waiting for CVOX result");
return false;
}
mResultLock.wait(waitTimeMillis);
} catch (InterruptedException ie) {
if (DEBUG)
Log.w(TAG, "Timed out while waiting for CVOX result");
Log.w(TAG, "Interrupted while waiting for CVOX result");
/* ignore */
}
}
@@ -805,6 +826,8 @@ class AccessibilityInjector {
@JavascriptInterface
@SuppressWarnings("unused")
public void onResult(String id, String result) {
if (DEBUG)
Log.w(TAG, "Saw CVOX result of '" + result + "'");
final long resultId;
try {