diff options
| author | Patrick Scott <phanna@android.com> | 2011-03-09 05:08:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-09 05:08:15 -0800 |
| commit | 5d534f288d0c29337458e267fd207236bc23fec5 (patch) | |
| tree | 2f297221224cbf01edd6bff216a06ceb2a1667d0 /core/java/android/webkit/BrowserFrame.java | |
| parent | b4ca8b7696ea8559fced8bcdf36e11ed28785c7c (diff) | |
| parent | ea44c7c71431adbce348cf9ef3f22d9561bb7fc1 (diff) | |
am ea44c7c7: Merge "Pass the auto login header information to the app." into honeycomb-mr1
* commit 'ea44c7c71431adbce348cf9ef3f22d9561bb7fc1':
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 ab4bfe19f3f9..c7a7374375a1 100644 --- a/core/java/android/webkit/BrowserFrame.java +++ b/core/java/android/webkit/BrowserFrame.java @@ -1237,11 +1237,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 //========================================================================== |