diff options
| author | Patrick Scott <phanna@android.com> | 2011-03-09 05:10:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 05:10:34 -0800 |
| commit | 888f0654fd2ecbe76be12e2a57b41191e78bb87e (patch) | |
| tree | 5fac96aba39e7df72974067aab8f091306e2ef59 /core/java/android/webkit/BrowserFrame.java | |
| parent | 6a5ecc090020d84f91374b54f2e8cb1ca152c4bd (diff) | |
| parent | 5d534f288d0c29337458e267fd207236bc23fec5 (diff) | |
am 5d534f28: am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit '5d534f288d0c29337458e267fd207236bc23fec5':
Pass the auto login header information to the app.
Diffstat (limited to 'core/java/android/webkit/BrowserFrame.java')
| -rw-r--r-- | core/java/android/webkit/BrowserFrame.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java/android/webkit/BrowserFrame.java b/core/java/android/webkit/BrowserFrame.java index 24c0e68f0ccf..6306274e34c6 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -1240,11 +1240,17 @@ class BrowserFrame extends Handler { } } - /*package*/ SearchBox getSearchBox() { return mSearchBox; } + /** + * Called by JNI when processing the X-Auto-Login header. + */ + private void autoLogin(String realm, String account, String args) { + mCallbackProxy.onReceivedLoginRequest(realm, account, args); + } + //========================================================================== // native functions //========================================================================== |