diff options
author | Jonathan Dixon <joth@google.com> | 2013-08-25 19:35:27 -0700 |
---|---|---|
committer | Jonathan Dixon <joth@google.com> | 2013-08-25 20:07:02 -0700 |
commit | f9e1705d4012706664a2bdf63a50b8a784b833dd (patch) | |
tree | 9cf92ff971c6cd8124391da966f208db2f588baa /src/com/android/browser/KeyChainLookup.java | |
parent | 56b5495f6761d5800918682a5b6bdd282019f14b (diff) | |
download | packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.zip packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.tar.gz packages_apps_Browser-f9e1705d4012706664a2bdf63a50b8a784b833dd.tar.bz2 |
De-classicify Android Browser part 2
Bug: 10427705
Allows Browser to compile even when WebViewClassic is no longer in
frameworks/base. The deleted functionality was already disabled at
runtime when using non-classic webview.
Change-Id: I21b58ec52ac059c699b49a2dd80008d9a9e6791a
Diffstat (limited to 'src/com/android/browser/KeyChainLookup.java')
-rw-r--r-- | src/com/android/browser/KeyChainLookup.java | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/src/com/android/browser/KeyChainLookup.java b/src/com/android/browser/KeyChainLookup.java deleted file mode 100644 index 4d5f694..0000000 --- a/src/com/android/browser/KeyChainLookup.java +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 201 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.browser; - -import android.content.Context; -import android.os.AsyncTask; -import android.security.KeyChain; -import android.security.KeyChainException; -import android.webkit.ClientCertRequestHandler; -import java.security.PrivateKey; -import java.security.cert.X509Certificate; - -final class KeyChainLookup extends AsyncTask<Void, Void, Void> { - private final Context mContext; - private final ClientCertRequestHandler mHandler; - private final String mAlias; - KeyChainLookup(Context context, ClientCertRequestHandler handler, String alias) { - mContext = context.getApplicationContext(); - mHandler = handler; - mAlias = alias; - } - @Override protected Void doInBackground(Void... params) { - PrivateKey privateKey; - X509Certificate[] certificateChain; - try { - privateKey = KeyChain.getPrivateKey(mContext, mAlias); - certificateChain = KeyChain.getCertificateChain(mContext, mAlias); - } catch (InterruptedException e) { - mHandler.ignore(); - return null; - } catch (KeyChainException e) { - mHandler.ignore(); - return null; - } - mHandler.proceed(privateKey, certificateChain); - return null; - } -} |