diff options
| author | Jay Shrauner <shrauner@google.com> | 2015-08-11 19:26:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 19:26:21 +0000 |
| commit | 1af117eda9541dc3f20995c116a8c53934f75da9 (patch) | |
| tree | b046ad6fb933d86435bec26c55caaf1ea331e832 | |
| parent | f9712e0b814c01f05a1f2f38ae26a5ed4ee62267 (diff) | |
| parent | c4a900e0c66573c18f86961c9862a577654aeabe (diff) | |
| download | android_packages_apps_ContactsCommon-1af117eda9541dc3f20995c116a8c53934f75da9.tar.gz android_packages_apps_ContactsCommon-1af117eda9541dc3f20995c116a8c53934f75da9.tar.bz2 android_packages_apps_ContactsCommon-1af117eda9541dc3f20995c116a8c53934f75da9.zip | |
am c4a900e0: am 3adc28de: DO NOT MERGE Catch SecurityExceptions in onCreateDialog
* commit 'c4a900e0c66573c18f86961c9862a577654aeabe':
DO NOT MERGE Catch SecurityExceptions in onCreateDialog
| -rw-r--r-- | src/com/android/contacts/common/interactions/ImportExportDialogFragment.java | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java index 5e1daf43..823d5224 100644 --- a/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java +++ b/src/com/android/contacts/common/interactions/ImportExportDialogFragment.java @@ -122,8 +122,13 @@ public class ImportExportDialogFragment extends DialogFragment R.string.import_from_vcf_file)); } if (manager != null && res.getBoolean(R.bool.config_allow_sim_import)) { - final List<SubscriptionInfo> subInfoRecords = - mSubscriptionManager.getActiveSubscriptionInfoList(); + List<SubscriptionInfo> subInfoRecords = null; + try { + subInfoRecords = mSubscriptionManager.getActiveSubscriptionInfoList(); + } catch (SecurityException e) { + Log.w(TAG, "SecurityException thrown, lack permission for" + + " getActiveSubscriptionInfoList", e); + } if (subInfoRecords != null) { if (subInfoRecords.size() == 1) { adapter.add(new AdapterEntry(getString(R.string.import_from_sim), |