summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2015-04-18 13:14:24 -0700
committerAng Li <angli@google.com>2015-05-12 21:20:43 +0000
commit655de814c465f4e20cfb122cf4c6d9a5670562aa (patch)
tree426bf6405b4016ad35618f31e824a582e95ea26b
parent756c09a808d0bc6cb3e4144a7c56b0391ef7ee11 (diff)
downloadandroid_packages_apps_CertInstaller-655de814c465f4e20cfb122cf4c6d9a5670562aa.tar.gz
android_packages_apps_CertInstaller-655de814c465f4e20cfb122cf4c6d9a5670562aa.tar.bz2
android_packages_apps_CertInstaller-655de814c465f4e20cfb122cf4c6d9a5670562aa.zip
EXTRA_MIME_TYPES is String[], not Object[].
Bug: 20299782 Change-Id: I532225717c913ecc340edfdfe8fc974c778d495b Cherry pick from master. b/20126912
-rw-r--r--src/com/android/certinstaller/CertInstallerMain.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/certinstaller/CertInstallerMain.java b/src/com/android/certinstaller/CertInstallerMain.java
index 96141ba..5950432 100644
--- a/src/com/android/certinstaller/CertInstallerMain.java
+++ b/src/com/android/certinstaller/CertInstallerMain.java
@@ -104,9 +104,10 @@ public class CertInstallerMain extends PreferenceActivity {
|| (bundle.size() == 1
&& (bundle.containsKey(KeyChain.EXTRA_NAME)
|| bundle.containsKey(Credentials.EXTRA_INSTALL_AS_UID)))) {
+ final String[] mimeTypes = MIME_MAPPINGS.keySet().toArray(new String[0]);
final Intent openIntent = new Intent(Intent.ACTION_OPEN_DOCUMENT);
openIntent.setType("*/*");
- openIntent.putExtra(Intent.EXTRA_MIME_TYPES, MIME_MAPPINGS.keySet().toArray());
+ openIntent.putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
openIntent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, true);
startActivityForResult(openIntent, REQUEST_OPEN_DOCUMENT);
} else {