summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcos Marado <mmarado@cyngn.com>2014-11-20 17:10:36 +0000
committerBrint E. Kriebel <bekit@cyngn.com>2014-11-20 20:30:02 +0000
commit0b3597fe35613121ec68708c5ebfb751cc8e4d92 (patch)
tree3b23dd69d6d47a40b1380dc7b7652864dde46869
parent581931230c44cab3f687e9847cab67c83d0e85b7 (diff)
downloadandroid_packages_services_Telephony-shipping/cm-11.0.tar.gz
android_packages_services_Telephony-shipping/cm-11.0.tar.bz2
android_packages_services_Telephony-shipping/cm-11.0.zip
bugfix: deal with non-contact file being opened as contact filecm-11.0-XNPH05Q-tomato-9828f8e9ccstable/cm-11.0-XNF8Yshipping/cm-11.0
Change-Id: I947aae321347b347e7437625fc517d3004591979 (cherry picked from commit 327838517968f7b97784a06f459a8801cb7d1fee)
-rw-r--r--src/com/android/phone/CallFeaturesSetting.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/com/android/phone/CallFeaturesSetting.java b/src/com/android/phone/CallFeaturesSetting.java
index b147b265d..c6c34069b 100644
--- a/src/com/android/phone/CallFeaturesSetting.java
+++ b/src/com/android/phone/CallFeaturesSetting.java
@@ -951,6 +951,8 @@ public class CallFeaturesSetting extends PreferenceActivity
}
mSubMenuVoicemailSettings.onPickActivityResult(cursor.getString(0));
return;
+ } catch (SQLiteException sqle) {
+ log("onActivityResult: bad contact data, no results found.");
} finally {
if (cursor != null) {
cursor.close();