Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b73fc1a authored by Geremy Condra's avatar Geremy Condra Committed by Android Git Automerger
Browse files

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

* commit '2b4bc305':
  DO NOT MERGE Control access to tts objects
parents 65b59f50 2b4bc305

core/java/android/webkit/AccessibilityInjector.java

+2 −2
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ class AccessibilityInjector { 
            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 @@ class AccessibilityInjector { 
        }



        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() {