| commit | 7424571ac4bfb0b63f0aa1af8fb8228cd52ede10 | [log] [tgz] |
|---|---|---|
| author | Sanket Padawe <[email protected]> | Thu Mar 23 01:07:04 2017 +0000 |
| committer | android-build-merger <[email protected]> | Thu Mar 23 01:07:04 2017 +0000 |
| tree | 2e4b4665f20c294724675ba3cd5ba745df093ca4 | |
| parent | 616dc26461a2791297031c14525551a7bd8326dc [diff] | |
| parent | dd192a650bae5c381037a5cf6307f4bc32066a61 [diff] |
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc am: dd192a650b -s ours Change-Id: I286766be1fc7bf035996e3ddd21744f1334f743b
diff --git a/res/values-az-rAZ/arrays.xml b/res/values-az/arrays.xml similarity index 100% rename from res/values-az-rAZ/arrays.xml rename to res/values-az/arrays.xml
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml similarity index 100% rename from res/values-az-rAZ/strings.xml rename to res/values-az/strings.xml
diff --git a/res/values-bn-rBD/arrays.xml b/res/values-bn/arrays.xml similarity index 100% rename from res/values-bn-rBD/arrays.xml rename to res/values-bn/arrays.xml
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml similarity index 100% rename from res/values-bn-rBD/strings.xml rename to res/values-bn/strings.xml
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et/arrays.xml similarity index 100% rename from res/values-et-rEE/arrays.xml rename to res/values-et/arrays.xml
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml similarity index 100% rename from res/values-et-rEE/strings.xml rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/arrays.xml b/res/values-eu/arrays.xml similarity index 100% rename from res/values-eu-rES/arrays.xml rename to res/values-eu/arrays.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml similarity index 100% rename from res/values-eu-rES/strings.xml rename to res/values-eu/strings.xml
diff --git a/res/values-gl-rES/arrays.xml b/res/values-gl/arrays.xml similarity index 100% rename from res/values-gl-rES/arrays.xml rename to res/values-gl/arrays.xml
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml similarity index 100% rename from res/values-gl-rES/strings.xml rename to res/values-gl/strings.xml
diff --git a/res/values-gu-rIN/arrays.xml b/res/values-gu/arrays.xml similarity index 100% rename from res/values-gu-rIN/arrays.xml rename to res/values-gu/arrays.xml
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml similarity index 100% rename from res/values-gu-rIN/strings.xml rename to res/values-gu/strings.xml
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy/arrays.xml similarity index 100% rename from res/values-hy-rAM/arrays.xml rename to res/values-hy/arrays.xml
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml similarity index 100% rename from res/values-hy-rAM/strings.xml rename to res/values-hy/strings.xml
diff --git a/res/values-is-rIS/arrays.xml b/res/values-is/arrays.xml similarity index 100% rename from res/values-is-rIS/arrays.xml rename to res/values-is/arrays.xml
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml similarity index 100% rename from res/values-is-rIS/strings.xml rename to res/values-is/strings.xml
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka/arrays.xml similarity index 100% rename from res/values-ka-rGE/arrays.xml rename to res/values-ka/arrays.xml
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml similarity index 100% rename from res/values-ka-rGE/strings.xml rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/arrays.xml b/res/values-kk/arrays.xml similarity index 100% rename from res/values-kk-rKZ/arrays.xml rename to res/values-kk/arrays.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml similarity index 100% rename from res/values-kk-rKZ/strings.xml rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km/arrays.xml similarity index 100% rename from res/values-km-rKH/arrays.xml rename to res/values-km/arrays.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml similarity index 100% rename from res/values-km-rKH/strings.xml rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/arrays.xml b/res/values-kn/arrays.xml similarity index 100% rename from res/values-kn-rIN/arrays.xml rename to res/values-kn/arrays.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml similarity index 100% rename from res/values-kn-rIN/strings.xml rename to res/values-kn/strings.xml
diff --git a/res/values-ky-rKG/arrays.xml b/res/values-ky/arrays.xml similarity index 100% rename from res/values-ky-rKG/arrays.xml rename to res/values-ky/arrays.xml
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml similarity index 100% rename from res/values-ky-rKG/strings.xml rename to res/values-ky/strings.xml
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo/arrays.xml similarity index 100% rename from res/values-lo-rLA/arrays.xml rename to res/values-lo/arrays.xml
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml similarity index 100% rename from res/values-lo-rLA/strings.xml rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/arrays.xml b/res/values-mk/arrays.xml similarity index 100% rename from res/values-mk-rMK/arrays.xml rename to res/values-mk/arrays.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml similarity index 100% rename from res/values-mk-rMK/strings.xml rename to res/values-mk/strings.xml
diff --git a/res/values-ml-rIN/arrays.xml b/res/values-ml/arrays.xml similarity index 100% rename from res/values-ml-rIN/arrays.xml rename to res/values-ml/arrays.xml
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml similarity index 100% rename from res/values-ml-rIN/strings.xml rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn/arrays.xml similarity index 100% rename from res/values-mn-rMN/arrays.xml rename to res/values-mn/arrays.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml similarity index 100% rename from res/values-mn-rMN/strings.xml rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN/arrays.xml b/res/values-mr/arrays.xml similarity index 100% rename from res/values-mr-rIN/arrays.xml rename to res/values-mr/arrays.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml similarity index 100% rename from res/values-mr-rIN/strings.xml rename to res/values-mr/strings.xml
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms/arrays.xml similarity index 100% rename from res/values-ms-rMY/arrays.xml rename to res/values-ms/arrays.xml
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml similarity index 100% rename from res/values-ms-rMY/strings.xml rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/arrays.xml b/res/values-my/arrays.xml similarity index 100% rename from res/values-my-rMM/arrays.xml rename to res/values-my/arrays.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml similarity index 100% rename from res/values-my-rMM/strings.xml rename to res/values-my/strings.xml
diff --git a/res/values-ne-rNP/arrays.xml b/res/values-ne/arrays.xml similarity index 100% rename from res/values-ne-rNP/arrays.xml rename to res/values-ne/arrays.xml
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml similarity index 100% rename from res/values-ne-rNP/strings.xml rename to res/values-ne/strings.xml
diff --git a/res/values-pa-rIN/arrays.xml b/res/values-pa/arrays.xml similarity index 100% rename from res/values-pa-rIN/arrays.xml rename to res/values-pa/arrays.xml
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml similarity index 100% rename from res/values-pa-rIN/strings.xml rename to res/values-pa/strings.xml
diff --git a/res/values-si-rLK/arrays.xml b/res/values-si/arrays.xml similarity index 100% rename from res/values-si-rLK/arrays.xml rename to res/values-si/arrays.xml
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml similarity index 100% rename from res/values-si-rLK/strings.xml rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/arrays.xml b/res/values-sq/arrays.xml similarity index 100% rename from res/values-sq-rAL/arrays.xml rename to res/values-sq/arrays.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml similarity index 100% rename from res/values-sq-rAL/strings.xml rename to res/values-sq/strings.xml
diff --git a/res/values-ta-rIN/arrays.xml b/res/values-ta/arrays.xml similarity index 100% rename from res/values-ta-rIN/arrays.xml rename to res/values-ta/arrays.xml
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml similarity index 100% rename from res/values-ta-rIN/strings.xml rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/arrays.xml b/res/values-te/arrays.xml similarity index 100% rename from res/values-te-rIN/arrays.xml rename to res/values-te/arrays.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml similarity index 100% rename from res/values-te-rIN/strings.xml rename to res/values-te/strings.xml
diff --git a/res/values-ur-rPK/arrays.xml b/res/values-ur/arrays.xml similarity index 100% rename from res/values-ur-rPK/arrays.xml rename to res/values-ur/arrays.xml
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml similarity index 100% rename from res/values-ur-rPK/strings.xml rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/arrays.xml b/res/values-uz/arrays.xml similarity index 100% rename from res/values-uz-rUZ/arrays.xml rename to res/values-uz/arrays.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml similarity index 100% rename from res/values-uz-rUZ/strings.xml rename to res/values-uz/strings.xml
diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index ceb6a85..22578b1 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java
@@ -1248,7 +1248,8 @@ for (int i = 0; i < partsNum; i++) { final PduPart part = body.getPart(i); final Uri partUri = part.getDataUri(); - if ((partUri == null) || !partUri.getAuthority().startsWith("mms")) { + if ((partUri == null) || TextUtils.isEmpty(partUri.getAuthority()) + || !partUri.getAuthority().startsWith("mms")) { toBeCreated.add(part); } else { toBeUpdated.put(partUri, part);