Put in dummy activity to request SSL cert
Bug: 5117682
Change-Id: I2a7c43544f588eb507a470dc09056a3d54c0ad19
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1b2c057..ba649c5 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -155,5 +155,13 @@
android:name="android.content.ContactDirectory"
android:value="true"/>
</provider>
+
+ <activity android:name=".EasCertificateRequestor">
+ <intent-filter>
+ <action android:name="com.android.emailcommon.REQUEST_CERT" />
+ <data android:scheme="eas" android:path="/certrequest" />
+ <category android:name="android.intent.category.DEFAULT" />
+ </intent-filter>
+ </activity>
</application>
</manifest>
diff --git a/src/com/android/exchange/EasCertificateRequestor.java b/src/com/android/exchange/EasCertificateRequestor.java
new file mode 100644
index 0000000..ebafe44
--- /dev/null
+++ b/src/com/android/exchange/EasCertificateRequestor.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2011 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.exchange;
+
+import android.security.KeyChain;
+
+import com.android.emailcommon.utility.CertificateRequestor;
+
+/**
+ * A subclass of the {@link CertificateRequestor} so that the Exchange process
+ * can request access to a certificate.
+ *
+ * They {@link KeyChain} API works in such a way that the host
+ * activity requesting the certificate must be running in the process with the UID of who will
+ * actually use the certificate. Since the Exchange process needs to establish connections and use
+ * certificates for EAS accounts, requests for certificates must be delegated by an Activity in this
+ * process.
+ */
+public class EasCertificateRequestor extends CertificateRequestor {
+ // Intentionally blank - no behavior overridden.
+}
