am 2b4bc30: Merge "DO NOT MERGE Control access to tts objects" into jb-dev

gcondra · Android Git Automerger · commit 8b73fc1ad3c0 · 2012-11-08T14:26:39.000-08:00
* commit '2b4bc305a2305d1dda66e054d228b4708575ff8d':
  DO NOT MERGE Control access to tts objects
diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java
@@ -351,7 +351,7 @@ private void addTtsApis() {
             return;
         }
         mTextToSpeech = new TextToSpeechWrapper(mContext);
-        mWebViewClassic.addJavascriptInterface(mTextToSpeech, ALIAS_TTS_JS_INTERFACE, false);
+        mWebViewClassic.addJavascriptInterface(mTextToSpeech, ALIAS_TTS_JS_INTERFACE, true);
     }
 
     /**
@@ -375,7 +375,7 @@ private void addCallbackApis() {
         }
 
         mCallback = new CallbackHandler(ALIAS_TRAVERSAL_JS_INTERFACE);
-        mWebViewClassic.addJavascriptInterface(mCallback, ALIAS_TRAVERSAL_JS_INTERFACE, false);
+        mWebViewClassic.addJavascriptInterface(mCallback, ALIAS_TRAVERSAL_JS_INTERFACE, true);
     }
 
     private void removeCallbackApis() {

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ private void addTtsApis() {`
`351`	`351`	`return;`
`352`	`352`	`}`
`353`	`353`	`mTextToSpeech = new TextToSpeechWrapper(mContext);`
`354`		`- mWebViewClassic.addJavascriptInterface(mTextToSpeech, ALIAS_TTS_JS_INTERFACE, false);`
	`354`	`+ mWebViewClassic.addJavascriptInterface(mTextToSpeech, ALIAS_TTS_JS_INTERFACE, true);`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`/**`
`@@ -375,7 +375,7 @@ private void addCallbackApis() {`
`375`	`375`	`}`
`376`	`376`
`377`	`377`	`mCallback = new CallbackHandler(ALIAS_TRAVERSAL_JS_INTERFACE);`
`378`		`- mWebViewClassic.addJavascriptInterface(mCallback, ALIAS_TRAVERSAL_JS_INTERFACE, false);`
	`378`	`+ mWebViewClassic.addJavascriptInterface(mCallback, ALIAS_TRAVERSAL_JS_INTERFACE, true);`
`379`	`379`	`}`
`380`	`380`
`381`	`381`	`private void removeCallbackApis() {`