summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser/Tab.java
diff options
context:
space:
mode:
authorTarun Nainani <tnainani@codeaurora.org>2015-07-31 11:37:16 -0700
committerjrizzoli <joey@cyanogenmoditalia.it>2015-08-28 13:15:47 +0200
commitcf41be035f53a4c77a67bb301830896f1969c97c (patch)
treed0228dcf176fabbc4ceb7e1ee36b48ffca0ad607 /src/com/android/browser/Tab.java
parent7c762c8c002977068ac965a3a94d47c908a59f3e (diff)
downloadandroid_packages_apps_Gello-cf41be035f53a4c77a67bb301830896f1969c97c.tar.gz
android_packages_apps_Gello-cf41be035f53a4c77a67bb301830896f1969c97c.tar.bz2
android_packages_apps_Gello-cf41be035f53a4c77a67bb301830896f1969c97c.zip
Fix crash while trying to load client certificate
Provide default implementation for PKCS11AuthenticationManager to fix null pointer crash. Clean-up client certificate api as now we use chromium's implementation for the same. Change-Id: I10c69b5d168e03ffb3fd9767bd17d5374e161111
Diffstat (limited to 'src/com/android/browser/Tab.java')
-rw-r--r--src/com/android/browser/Tab.java40
1 files changed, 0 insertions, 40 deletions
diff --git a/src/com/android/browser/Tab.java b/src/com/android/browser/Tab.java
index f533f6c1..bb1ec9da 100644
--- a/src/com/android/browser/Tab.java
+++ b/src/com/android/browser/Tab.java
@@ -64,7 +64,6 @@ import com.android.browser.provider.SnapshotProvider.Snapshots;
import org.codeaurora.swe.BrowserCommandLine;
import org.codeaurora.swe.BrowserDownloadListener;
-import org.codeaurora.swe.ClientCertRequestHandler;
import org.codeaurora.swe.HttpAuthHandler;
import org.codeaurora.swe.WebBackForwardList;
import org.codeaurora.swe.WebChromeClient;
@@ -490,45 +489,6 @@ class Tab implements PictureListener {
}
/**
- * Displays client certificate request to the user.
- */
- @Override
- public void onReceivedClientCertRequest(final WebView view,
- final ClientCertRequestHandler handler, final String host_and_port) {
- if (!mInForeground) {
- handler.ignore();
- return;
- }
- int colon = host_and_port.lastIndexOf(':');
- String host;
- int port;
- if (colon == -1) {
- host = host_and_port;
- port = -1;
- } else {
- String portString = host_and_port.substring(colon + 1);
- try {
- port = Integer.parseInt(portString);
- host = host_and_port.substring(0, colon);
- } catch (NumberFormatException e) {
- host = host_and_port;
- port = -1;
- }
- }
- KeyChain.choosePrivateKeyAlias(
- mWebViewController.getActivity(), new KeyChainAliasCallback() {
- @Override
- public void alias(String alias) {
- if (alias == null) {
- handler.cancel();
- return;
- }
- new KeyChainLookup(mContext, handler, alias).execute();
- }
- }, null, null, host, port, null);
- }
-
- /**
* Handles an HTTP authentication request.
*
* @param handler The authentication handler