summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/browser/KeyChainLookup.java4
-rw-r--r--src/com/android/browser/Tab.java6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/browser/KeyChainLookup.java b/src/com/android/browser/KeyChainLookup.java
index 7f236e5..52be25a 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 e517d76..89f567b 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);
}
/**