Handle invalid subscription id
Don't pass a subscription id of -1 to provider.
Bug:18524128
Change-Id: Ic1f4bc322bba9317a00bb2ca05e1a9ea14446e3a
diff --git a/src/com/android/phone/SimContacts.java b/src/com/android/phone/SimContacts.java
index ac76d4f..9f7f868 100644
--- a/src/com/android/phone/SimContacts.java
+++ b/src/com/android/phone/SimContacts.java
@@ -244,8 +244,11 @@
@Override
protected Uri resolveIntent() {
final Intent intent = getIntent();
+ int subId = -1;
if (intent.hasExtra("subscription_id")) {
- final int subId = intent.getIntExtra("subscription_id", -1);
+ subId = intent.getIntExtra("subscription_id", -1);
+ }
+ if (subId != -1) {
intent.setData(Uri.parse("content://icc/adn/subId/" + subId));
} else {
intent.setData(Uri.parse("content://icc/adn"));