diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 08:09:01 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-05-17 08:09:01 +0000 |
| commit | 0b8d0f332863269cbbbb11a8e79034a5c1fa2703 (patch) | |
| tree | f8f8c13ecbb9414f686c186b8503e166590d7b39 | |
| parent | 7424571ac4bfb0b63f0aa1af8fb8228cd52ede10 (diff) | |
| parent | 33e6be1db8bacd86342ad65e68669d8117dcef02 (diff) | |
| download | Messaging-0b8d0f332863269cbbbb11a8e79034a5c1fa2703.tar.gz | |
release-request-655284b0-7f0b-48b5-b01d-27f48a99f2c0-for-git_oc-mr1-release-4017105 snap-temp-L82600000064873863
Change-Id: I242ac1b372312cddada3735a91ff952cc4e03b21
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/messaging/mmslib/pdu/PduPersister.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 22459c4..8b4ef03 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -474,7 +474,7 @@ <receiver android:name=".receiver.DefaultSmsSubscriptionChangeReceiver"> <intent-filter> - <action android:name="android.intent.action.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED"/> + <action android:name="android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED"/> </intent-filter> </receiver> diff --git a/src/com/android/messaging/mmslib/pdu/PduPersister.java b/src/com/android/messaging/mmslib/pdu/PduPersister.java index 22578b1..5c54e7b 100644 --- a/src/com/android/messaging/mmslib/pdu/PduPersister.java +++ b/src/com/android/messaging/mmslib/pdu/PduPersister.java @@ -918,7 +918,7 @@ public class PduPersister { } if (data == null) { dataUri = part.getDataUri(); - if ((dataUri == null) || (dataUri == uri)) { + if ((dataUri == null) || (dataUri.equals(uri))) { Log.w(TAG, "Can't find data for this part."); return; } @@ -1202,7 +1202,7 @@ public class PduPersister { // 1. New binary data supplied or // 2. The Uri of the part is different from the current one. if ((part.getData() != null) - || (uri != part.getDataUri())) { + || (!uri.equals(part.getDataUri()))) { persistData(part, uri, contentType, preOpenedFiles); } } |