Commit Graph
867 Commits
Author SHA1 Message Date
Taesu Lee 8c08a3f419 Mark messages as failed if SIM is inactive
If a SIM is inactive, Mark messages corresponding to the SIM as failed
instead of updating selfId as default selfId. The failed messages could
be sent through the SIM manually if the SIM is re-activated.

Test: Manual

Change-Id: I1eee7c12aaedebe8aa3e0c41b4b057758a3b17a2
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-10-06 12:33:21 +09:00
Taesu Lee 9c97af9b83 Fix creating a new conversation including own number
If a device own phone number is unknown and there is only a single
address in all TO and CC for incoming MMS, ignore the address as it is
device own phone number.

Test: Manual

Change-Id: I26de39bd3b71d3ad391372f35cfce0bd5c7b66ed
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-09-16 15:19:58 +09:00
Xin Li 1303239498 Merge Android R
Bug: 168057903
Merged-In: Ia11f7837439c1b4f12ba51e676952659a5fb542f
Change-Id: Id98fe14ac2bebd36dbdd0f46ef723d9af7e889c4
2020-09-08 16:56:05 -07:00
Xin Li dd810e2520 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
Change-Id: Ia11f7837439c1b4f12ba51e676952659a5fb542f
2020-08-27 10:16:52 -07:00
Xin Li bfb85db768 [automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours
am skip reason: Change-Id Ic5eb962d272432725f634d485742e025a15b8011 with SHA-1 8fe5feae57 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1409198

Change-Id: I0146d96c15587fd08193c8cb5942c76d0d3a1a33
2020-08-25 05:57:10 +00:00
Xin Li b8b866e236 Merge stage branch to development trunk.
Bug: 160260413
Merged-In: Ic5eb962d272432725f634d485742e025a15b8011
Change-Id: Ica8ca2884ddb2beb4558e62bc1b5cb640d7e2023
2020-08-24 22:31:56 +00:00
Raman Tenneti 8fe5feae57 AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899

Change-Id: Ic5eb962d272432725f634d485742e025a15b8011
2020-07-30 01:26:06 +00:00
Raman Tenneti 4b52654e98 AOSP/Messaging - Update language to comply with Android's inclusive language guidance.
See https://source.android.com/setup/contribute/respectful-code for reference

BUG=161896447

Test: make and make messagingtests
Change-Id: I01c520f1d5e9eab8dbb25b08d133ae34bd301093
2020-07-29 16:43:46 -07:00
Raman Tenneti 0875a1420e AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9 am: 4c12eb471c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: Ie84f1ff41433b8d07cf1306723e772dd598b3ccf
2020-07-10 03:16:05 +00:00
Raman Tenneti 4c12eb471c AOSP/Messaging - Changes to make unit tests to run and pass. am: b1aa213ce9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1360018

Change-Id: I5dad8a738ccecbb85c8788fcd867f7b3631c8deb
2020-07-10 03:10:09 +00:00
Raman Tenneti b1aa213ce9 AOSP/Messaging - Changes to make unit tests to run and pass.
+ Added missing androix libraries to LOCAL_STATIC_ANDROID_LIBRARIES.
+ Added keep class statements for androidx and messaging classes.
+ Deleted Assert.isEngBuild call (this package is the last user of that method).
+ Added import statements for androidx classes.

Test: manual - Tested the messaging UI. Ran the following tests on Pixel phone.

$ make -j 40
$ make messagingtests -j
$ find out -name "messaging*.apk" -print -exec ls -l {} \;
-rw-r----- 1 rtenneti primarygroup 733809 Jul  9 17:42 out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
-rw-r----- 1 rtenneti primarygroup 10799132 Jul  9 18:34 out/target/product/bonito/product/app/messaging/messaging.apk

$ adb install -r -d -t  out/target/product/bonito/product/app/messaging/messaging.apk
$ adb install -r -d -t  out/target/product/bonito/testcases/messagingtests/arm64/messagingtests.apk
$ adb shell am instrument -w com.android.messaging.test

com.android.messaging.datamodel.BindingTest:.......
com.android.messaging.datamodel.BitmapPoolTest:....
com.android.messaging.datamodel.ConversationListTest:.
com.android.messaging.datamodel.DataModelTest:...
com.android.messaging.datamodel.FrequentContactsCursorBuilderTest:...
com.android.messaging.datamodel.MemoryCacheManagerTest:.
com.android.messaging.datamodel.ParticipantRefreshTest:..........
com.android.messaging.datamodel.action.ActionServiceSystemTest:.....
com.android.messaging.datamodel.action.ActionServiceTest:..
com.android.messaging.datamodel.action.ActionTest:.....
com.android.messaging.datamodel.action.GetOrCreateConversationActionTest:.
com.android.messaging.datamodel.action.ReadWriteDraftMessageActionTest:......
com.android.messaging.datamodel.data.ConversationMessageDataTest:...
com.android.messaging.datamodel.data.ConversationParticipantsDataTest:.
com.android.messaging.datamodel.media.ImageRequestTest:..
com.android.messaging.datamodel.media.MediaResourceManagerTest:.....
com.android.messaging.ui.CustomHeaderViewPagerTest:.
com.android.messaging.ui.MultiAttachmentLayoutTest:...
com.android.messaging.ui.attachmentchooser.AttachmentChooserFragmentTest:.
com.android.messaging.ui.contact.ContactListItemViewTest:....
com.android.messaging.ui.contact.ContactPickerFragmentTest:......
com.android.messaging.ui.conversation.ComposeMessageViewTest:..
com.android.messaging.ui.conversation.ConversationActivityUiStateTest:....
com.android.messaging.ui.conversation.ConversationFragmentTest:..
com.android.messaging.ui.conversation.ConversationInputManagerTest:.....
com.android.messaging.ui.conversation.ConversationMessageViewTest:...
com.android.messaging.ui.conversationlist.ConversationListFragmentTest:...
com.android.messaging.ui.conversationlist.ConversationListItemViewTest:....
com.android.messaging.ui.mediapicker.AudioRecordViewTest:.
com.android.messaging.ui.mediapicker.CameraManagerTest:......
com.android.messaging.ui.mediapicker.GalleryGridItemViewTest:.....
com.android.messaging.ui.mediapicker.MediaPickerTest:..
com.android.messaging.util.BugleGservicesTest:.
com.android.messaging.util.YouTubeUtilTest:.
Test results for InstrumentationTestRunner=.........................................
.........................................
...............................
Time: 9.903

OK (113 tests)

Change-Id: If8fd8036791027739eb9bbb1d3849a46211a5137
2020-07-09 18:37:41 -07:00
Treehugger Robot 55aa308fcb Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd am: d67e1db151
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I323966094ad9d4c62f0a744de762dfb25d4c7c09
2020-06-29 17:02:59 +00:00
Treehugger Robot d67e1db151 Merge "Fix NoSuchMethodError for getTypeInfo()" am: 919cb6afdd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1352082

Change-Id: I3c817f847749649e3540e3827263cc8f7184f2b3
2020-06-29 16:53:27 +00:00
Treehugger Robot 919cb6afdd Merge "Fix NoSuchMethodError for getTypeInfo()" 2020-06-29 16:40:57 +00:00
Bill Yi 9d8f501d45 [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours am: a3c59da09d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1350824

Change-Id: I3116a3be591a59ec30711dc3554e62a7745f2928
2020-06-29 15:54:00 +00:00
Bill Yi a3c59da09d [automerger skipped] Import translations. DO NOT MERGE am: 8e0d3e91f3 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1350824

Change-Id: Iaa813c8fc1b91f8270670b9f0f59dfab655432f0
2020-06-29 15:37:55 +00:00
Taesu Lee f2d9199bfb Fix NoSuchMethodError for getTypeInfo()
Load an icon image for audio files from app resources instead because
ContentResolver#getTypeInfo() is for API level >= 29.
And it includes size-fit ic_photo_library_light images also.

Bug: 159987488
Test: Manual

Change-Id: Ie8f766f148a30e105e598e4b7e6b1b22bccda6ae
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-06-29 15:51:07 +09:00
Bill Yi 8e0d3e91f3 Import translations. DO NOT MERGE
BUG:148403740

TEST: m messaging

Merged-In: I4b74a267c0ed7cffe04d97ca465f2aa90ae1847a
Change-Id: Ie6f26f2a9e207adeee475e347f17dd8e0da78d9b
Auto-generated-cl: translation import
(cherry picked from commit 3bd7b79daa)
2020-06-28 18:51:48 +00:00
Taesu Lee 45cd97eabf Remove advanced category if no preference am: 392850a825 am: 34ebed2bba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1351522

Change-Id: I40e97e119cfefaf90e14efad2760e9e31a46a9b8
2020-06-26 17:00:47 +00:00
Taesu Lee 34ebed2bba Remove advanced category if no preference am: 392850a825
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1351522

Change-Id: Icbed01452b088198a11436aad233c281b4068067
2020-06-26 16:48:17 +00:00
Taesu Lee 392850a825 Remove advanced category if no preference
Test: In debug mode, turn off all the configs for advanced category

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I52ea0905b9d4f03a57b4849e5b575bc5e508dd2d
2020-06-26 19:25:05 +09:00
Raman Tenneti cc4904c89a AOSP/Messaging - Changed minSdkVersion to 19. am: 8926653a98 am: 58d5681edd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1348203

Change-Id: I31114ab0e25fc0c2352a42ec2202459730c4bf0a
2020-06-23 23:40:39 +00:00
Raman Tenneti 58d5681edd AOSP/Messaging - Changed minSdkVersion to 19. am: 8926653a98
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1348203

Change-Id: Icbbf5bf2bfa0e59e75fb0a0e87a928ee1fe93bf8
2020-06-23 23:16:24 +00:00
Raman Tenneti 8926653a98 AOSP/Messaging - Changed minSdkVersion to 19.
Bug: 159055957

Test: manual - Tested the messaging UI.

$ make -j 40

Change-Id: I6f89161d7c841e88fcd8496417ae1ab8e964961a
2020-06-23 22:10:34 +00:00
Treehugger Robot d43f2fd23c Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813 am: 92b38533ec
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345449

Change-Id: I32963ac99c68803399349b0c4e1f54b9621ba76c
2020-06-22 17:06:51 +00:00
Taesu Lee 5c393695c6 Fix app initialization issue if no permissions am: 297a6f7047 am: ba59a36fdb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345448

Change-Id: I2dd1a3cc46f51f2ca743674bab363c6e90f5f0ad
2020-06-22 17:06:36 +00:00
Treehugger Robot 92b38533ec Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" am: be4c269813
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345449

Change-Id: If661b26336c80e6c4928afd9adc2111eb2a255ee
2020-06-22 16:53:21 +00:00
Taesu Lee ba59a36fdb Fix app initialization issue if no permissions am: 297a6f7047
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1345448

Change-Id: If592a8e5431035c8a369917f24dbdd73e28bae4d
2020-06-22 16:53:14 +00:00
Treehugger Robot be4c269813 Merge "Fix SecurityException at getActiveSubscriptionInfoList() on N and O" 2020-06-22 16:38:07 +00:00
Taesu Lee 615ebb9dd6 Fix SecurityException at getActiveSubscriptionInfoList() on N and O
Creating ConnectivityUtil instances after checking the minimum set of
permissions since SubscriptionManager#getActiveSubscriptionInfoList()
requires READ_PHONE_STATE and users can revoke the permission.
On P and beyond, the subscription list will be filtered instead when no
permission.

Bug: 159421050
Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Iafc3c57060e1893a91e629b1b3e3ba9ad78967cb
2020-06-22 19:15:39 +09:00
Taesu Lee 297a6f7047 Fix app initialization issue if no permissions
Call onRequiredPermissionsAcquired() before calling redirect() so that
BugleApplication initialization can be done completed always even
PermissionCheckActivity#onResume() case.

Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I01bb681442e0b391238bc162ce139ff40d947eaf
2020-06-22 19:14:52 +09:00
Raman Tenneti 5850cee247 AOSP/Messaging - Changed midSdkVersion to 14 and reverted to using Telephony.Carriers.CONTENT_URI instead of Telephony.Carriers.SIM_APN_URI. am: 7f4bb54ece am: f556ac71f2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1344864

Change-Id: Id215ca02976858312f465f78e70eedb7d371317f
2020-06-19 23:50:53 +00:00
Raman Tenneti f556ac71f2 AOSP/Messaging - Changed midSdkVersion to 14 and reverted to using Telephony.Carriers.CONTENT_URI instead of Telephony.Carriers.SIM_APN_URI. am: 7f4bb54ece
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1344864

Change-Id: Idaac2e53f28bde3bd2d88c484744308130d5b4d0
2020-06-19 23:37:46 +00:00
Raman Tenneti 7f4bb54ece AOSP/Messaging - Changed midSdkVersion to 14 and reverted to using Telephony.Carriers.CONTENT_URI instead of Telephony.Carriers.SIM_APN_URI.
Fixes error: "NoSuchFieldError exception: Telephony.Carriers.SIM_APN_URI requires API level 29"

Bug: 159055957

Test: manual - Tested the messaging UI. Without this change the app is crashing when we click on it.

$ make -j 40

Change-Id: Ic34ccac673531a61386c1eaa3bbfff950d19517b
2020-06-19 21:58:29 +00:00
Treehugger Robot f33a0d0823 Merge "Fix handling format based on API level accordingly." am: d626bcaf0c am: ea97b36d27
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343463

Change-Id: Ibd799529f6cef95614f2bef54ad8a9f59e7df125
2020-06-19 17:16:39 +00:00
Taesu Lee 619f7547d3 Remove only one Lambda Exp for JAVA 7 am: 0c7ab8c20a am: 5db150a742
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343464

Change-Id: I7ea06fcff9be951ae5994ca1d9fc5d7d1efe648e
2020-06-19 17:16:27 +00:00
Treehugger Robot ea97b36d27 Merge "Fix handling format based on API level accordingly." am: d626bcaf0c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343463

Change-Id: I71a236a34be90808809c85bbe062e6452fb06afa
2020-06-19 17:04:32 +00:00
Taesu Lee 5db150a742 Remove only one Lambda Exp for JAVA 7 am: 0c7ab8c20a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343464

Change-Id: If165c85253bfd9bdcc2c3939def095968796fe83
2020-06-19 17:04:20 +00:00
Treehugger Robot d626bcaf0c Merge "Fix handling format based on API level accordingly." 2020-06-19 16:55:25 +00:00
Taesu Lee 0c7ab8c20a Remove only one Lambda Exp for JAVA 7
Remove a Lambda Exp and replace ConcurrentHashMap#computeIfAbsent() with
containsKey() and put() so that this app can be built using JAVA 7.

Test: Build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I7ff8a3b5fc4673dfe05c5ecc9418d377f3ed4f2e
2020-06-19 19:30:58 +09:00
Taesu Lee bd3b711aca Fix handling format based on API level accordingly.
Use SmsMessage#createFromPdu(pdu, format) at least on M and replace
SmsMessage#FORMAT_3GPP2 with "3gpp2".
 - SmsMessage#createFromPdu(pdu, format) is added in API level 23.
 - SmsMessage#FORMAT_3GPP2 is added in API level 28.

Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: Icab2c6c3c86ee8b6597881bfac6066fed60db4d2
2020-06-19 18:34:20 +09:00
Taesu Lee d810c8b49e Fix creating ConnectivityUtil to work on any platform am: dcfe928ff3 am: 86314ff8e6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343457

Change-Id: Icc9cbfc22b10f73726ea7230c0e463d459c1830b
2020-06-18 17:40:18 +00:00
Taesu Lee 86314ff8e6 Fix creating ConnectivityUtil to work on any platform am: dcfe928ff3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1343457

Change-Id: Id737b6239df8b85888e7832ab6f5e157be94de1f
2020-06-18 17:27:52 +00:00
Taesu Lee dcfe928ff3 Fix creating ConnectivityUtil to work on any platform
After this CL, ConnectivityUtil for default subId is used again on pre
N because TelephonyManager has createForSubscriptionId() for a specific
subId from N.
Nevertheless, listen() uses the default subId on PhoneStateListener
instead of the subId on the manager still even N. On O and beyond,
ConnectivityUtil works correctly on multi-sim devices.

Revert "Fix missing computeIfAbsent() method in L_MR1 and M"

This reverts commit f0ccb76d8d.

Reason for revert: Manage ConnectivityUtil instances for subIds at least
                   on N instead.

Test: Manual

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I2f08928a6798a2ce275c5c75569ad379999d274c
2020-06-18 19:24:27 +09:00
Treehugger Robot 69cd91a75f Merge "Fix missing computeIfAbsent() method in L_MR1 and M" am: db1ebc265c am: feaad2df13
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1341554

Change-Id: Iaccb9a0bfe078bb3712c875e30877bd2e0bdf1d2
2020-06-17 16:35:40 +00:00
Treehugger Robot feaad2df13 Merge "Fix missing computeIfAbsent() method in L_MR1 and M" am: db1ebc265c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1341554

Change-Id: I4bdfca1d8b537b3940eec4ecf1a166b78589b2db
2020-06-17 16:22:59 +00:00
Treehugger Robot db1ebc265c Merge "Fix missing computeIfAbsent() method in L_MR1 and M" 2020-06-17 16:15:32 +00:00
Taesu Lee f0ccb76d8d Fix missing computeIfAbsent() method in L_MR1 and M
Replace ConcurrentHashMap#computeIfAbsent() with containsKey() and put()
since computeIfAbsent() is added in API level 24.

Bug: 158846265
Test: Build

Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
Change-Id: I3c43f0d7b1f289f0442c9359de4f099217244387
2020-06-17 19:03:26 +09:00
Taesu Lee 742b382d83 Remove unnecessary methods from MmsUtils am: c9e85fd21a am: b9dd11dd77
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1339795

Change-Id: Ied8b839de8e07d04c89be7c24aaf8ea387a663d1
2020-06-16 16:45:35 +00:00
Taesu Lee b9dd11dd77 Remove unnecessary methods from MmsUtils am: c9e85fd21a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1339795

Change-Id: I6359187593ac39b7bbd1628cab743586515f72e8
2020-06-16 16:23:53 +00:00