diff options
| author | Brian Carlstrom <bdc@google.com> | 2011-06-09 21:11:52 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-09 21:11:52 -0700 |
| commit | 26d56c6833526718de9dadca60b53f1f851831eb (patch) | |
| tree | 0e3cb03df8d8c8ee6313c2ff677a369cf3822025 /src | |
| parent | fc6c49bdda8d5d6a6cddedba9a1908bc2a58d2c1 (diff) | |
| parent | aa09cd8dc20c9134b69ace4a7b84fe0103220fb4 (diff) | |
| download | packages_apps_Browser-26d56c6833526718de9dadca60b53f1f851831eb.tar.gz packages_apps_Browser-26d56c6833526718de9dadca60b53f1f851831eb.tar.bz2 packages_apps_Browser-26d56c6833526718de9dadca60b53f1f851831eb.zip | |
Merge "Tracking KeyChain API refinements"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/browser/KeyChainLookup.java | 4 | ||||
| -rw-r--r-- | src/com/android/browser/Tab.java | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/browser/KeyChainLookup.java b/src/com/android/browser/KeyChainLookup.java index 7f236e5a7..52be25af1 100644 --- a/src/com/android/browser/KeyChainLookup.java +++ b/src/com/android/browser/KeyChainLookup.java @@ -18,8 +18,8 @@ package com.android.browser; import android.content.Context; import android.os.AsyncTask; -import android.os.RemoteException; import android.security.KeyChain; +import android.security.KeyChainException; import android.webkit.ClientCertRequestHandler; import java.security.PrivateKey; import java.security.cert.X509Certificate; @@ -42,7 +42,7 @@ final class KeyChainLookup extends AsyncTask<Void, Void, Void> { } catch (InterruptedException e) { mHandler.ignore(); return null; - } catch (RemoteException e) { + } catch (KeyChainException e) { mHandler.ignore(); return null; } diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java index e517d76ff..89f567b8a 100644 --- a/src/com/android/browser/Tab.java +++ b/src/com/android/browser/Tab.java @@ -33,7 +33,7 @@ import android.os.Bundle; import android.os.Message; import android.os.SystemClock; import android.security.KeyChain; -import android.security.KeyChainAliasResponse; +import android.security.KeyChainAliasCallback; import android.speech.RecognizerResultsIntent; import android.util.Log; import android.view.KeyEvent; @@ -803,7 +803,7 @@ class Tab { handler.ignore(); return; } - KeyChain.choosePrivateKeyAlias(mActivity, new KeyChainAliasResponse() { + KeyChain.choosePrivateKeyAlias(mActivity, new KeyChainAliasCallback() { @Override public void alias(String alias) { if (alias == null) { handler.cancel(); @@ -811,7 +811,7 @@ class Tab { } new KeyChainLookup(mActivity, handler, alias).execute(); } - }); + }, null, null, null, -1); } /** |