Xin Li
9abb1bc051
[automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours am: af3ff93aba -s ours am: d77a1c1158 -s ours
...
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I19493d785b7cb9be2d92fac2d6a2af0cf37b4653
2021-02-21 20:14:17 +00:00
Bob Badour
c647694475
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 9241539342 am: d6f78777af am: df860e8ada am: f2372f8d93
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1588050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I36b0d4c70810229bbc73b573638a824e76ea47c8
2021-02-21 20:09:18 +00:00
Xin Li
d77a1c1158
[automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours am: af3ff93aba -s ours
...
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6394735b5e61cd68930099892afc0866843e3a2a
2021-02-21 19:08:29 +00:00
Bob Badour
f2372f8d93
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 9241539342 am: d6f78777af am: df860e8ada
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1588050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I8de73ff74d201deb6104f70b894df0567ba3f451
2021-02-21 19:04:34 +00:00
Xin Li
af3ff93aba
[automerger skipped] Mark ab/7061308 as merged in stage. am: f59c740083 -s ours
...
am skip reason: Change-Id I26b0f374e227cba084ab4c794253a3d5347be363 with SHA-1 7310312ac1 is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If9a65ca482f2147310d67a3417c3be8de9e0a6a2
2021-02-20 14:54:59 +00:00
Xin Li
f59c740083
Mark ab/7061308 as merged in stage.
...
Bug: 180401296
Merged-In: I26b0f374e227cba084ab4c794253a3d5347be363
Change-Id: I2eee925bb5b7e55544ade75469e3c5865cc4b5e3
2021-02-20 00:24:33 -08:00
Bob Badour
df860e8ada
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 9241539342 am: d6f78777af
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1588050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I432987e208c7fa135d5ffcf11d3c05b4c4b8b5cb
2021-02-19 07:48:47 +00:00
Bob Badour
d6f78777af
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 9241539342
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1588050
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I00ecccea9a7665ba393ed2e49fa921bdb1a16ef7
2021-02-19 06:54:45 +00:00
Bob Badour
9241539342
[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging
...
Added SPDX-license-identifier-Apache-2.0 to:
jni/Android.mk
Bug: 68860345
Bug: 151177513
Bug: 151953481
Test: m all
Exempt-From-Owner-Approval: janitorial work
Change-Id: Iea41c5bbed690ac52f3ffa7c3b1ef40d62766af4
2021-02-12 17:53:53 -08:00
Taesu Lee
6800737041
Fix wrong sync message issue for pending outgoing messages am: bccecb6393 am: 6af3221619 am: cf7a8b123a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1547734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ifae7ac0acbe08f351b9c057a5912c3fe175ae02e
2021-01-12 22:08:19 +00:00
Taesu Lee
cf7a8b123a
Fix wrong sync message issue for pending outgoing messages am: bccecb6393 am: 6af3221619
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1547734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I21fb2baa06e6f91804ab9b8610334d87f747a67e
2021-01-12 21:02:31 +00:00
Taesu Lee
6af3221619
Fix wrong sync message issue for pending outgoing messages am: bccecb6393
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1547734
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id836b2cb21964189880a56c4747b1903907631b6
2021-01-12 20:46:50 +00:00
Taesu Lee
bccecb6393
Fix wrong sync message issue for pending outgoing messages
...
If sync operation is occurred between ResendMessageAction and
SendMessageAction, the pending outgoing messages in local db are deleted
and new messages are added from remote db.
To fix this issue, ResendMessageAction will update RETRY_TIMESTAMP only.
And RECEIVED_TIMESTAMP and SENT_TIMESTAMP will be updated in
SendMessageAction when the message is queued.
Test: manual
Change-Id: I0ffa6f46a7094ec3dfd2954d4313b78dd57d6994
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com >
2021-01-12 18:50:34 +09:00
Xin Li
2092fb2dcc
Mark ab/6881855 as merged am: 89efbab65d am: 7310312ac1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/13113081
Change-Id: Ib0dea4ed6a0ad62c8039c9b31e92617dc198a2ce
2020-11-23 22:58:50 +00:00
Xin Li
7310312ac1
Mark ab/6881855 as merged am: 89efbab65d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/13113081
Change-Id: I26b0f374e227cba084ab4c794253a3d5347be363
2020-11-23 22:31:38 +00:00
Xin Li
89efbab65d
Mark ab/6881855 as merged
...
Bug: 172690556
Change-Id: Ie831223c0a12c97e651c0742910808e9830efec8
2020-11-23 11:31:36 -08:00
Xin Li
e4698674b5
[automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours am: bf70b46b62 -s ours am: 00c0283147 -s ours
...
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12797420
Change-Id: I2308cbe7ce8dfa7097e21c1865194ef230ac1659
2020-10-09 03:37:05 +00:00
Xin Li
00c0283147
[automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours am: bf70b46b62 -s ours
...
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12797420
Change-Id: I4d81496cf65784cfc19d10ae6b15523ad638a5dd
2020-10-09 02:58:31 +00:00
Xin Li
bf70b46b62
[automerger skipped] Skip ab/6749736 in stage. am: 79b4382fc3 -s ours
...
am skip reason: Change-Id I0a6ebef1ef342258391bddeb34f5cc719ff28449 with SHA-1 6f8bb7e75e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12797420
Change-Id: Ic45124f2d068430b60dec959b719de106b90d4ac
2020-10-09 02:24:21 +00:00
Xin Li
79b4382fc3
Skip ab/6749736 in stage.
...
Merged-In: I0a6ebef1ef342258391bddeb34f5cc719ff28449
Change-Id: I08363195474384d1bc8a5f79b1fb81a724560b67
2020-10-08 17:22:57 -07:00
Taesu Lee
b84d8bddf2
Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3 am: 5b6d2cb110 am: c4339a83a9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316
Change-Id: I75c3cb226b5265f685a0aeba416edf88bc8b86ef
2020-10-07 19:15:33 +00:00
Taesu Lee
c4339a83a9
Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3 am: 5b6d2cb110
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316
Change-Id: I07d62d0098cf3c1e22f3b8f8c0f5dd9d3cc400e3
2020-10-07 18:43:09 +00:00
Taesu Lee
5b6d2cb110
Mark messages as failed if SIM is inactive am: 8c08a3f419 am: 947784d4f3
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316
Change-Id: I2b59d1cc26f6e021ccac3ebac5ee7dbc51261201
2020-10-07 18:25:04 +00:00
Taesu Lee
947784d4f3
Mark messages as failed if SIM is inactive am: 8c08a3f419
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1449316
Change-Id: I287467e6768f4915706710ab0172455ec6510f8c
2020-10-07 17:57:01 +00:00
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
bd2a71280d
Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf am: 492f7ee2d1 am: 807d8130e0
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818
Change-Id: Iec2bf14cd5aaf73701166721537ca2136a8b0b68
2020-09-16 23:54:01 +00:00
Taesu Lee
807d8130e0
Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf am: 492f7ee2d1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818
Change-Id: I66c7f94ca94bf20ac47f0b6c07d61d65fe7aaea4
2020-09-16 22:59:47 +00:00
Taesu Lee
492f7ee2d1
Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655 am: 71f8b60cdf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818
Change-Id: Ie2d803c9ed06cc4f404a8b0cc05e44d6905cea73
2020-09-16 20:41:35 +00:00
Taesu Lee
71f8b60cdf
Fix creating a new conversation including own number am: 9c97af9b83 am: e7df722655
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818
Change-Id: Ia88e65e4206eef84961c3d7dee3cda7b0330623f
2020-09-16 20:26:32 +00:00
Taesu Lee
e7df722655
Fix creating a new conversation including own number am: 9c97af9b83
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1427818
Change-Id: I692d40a9ab2d1f262ed2ad5a12cc47a7cdc46d64
2020-09-16 19:41:45 +00: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
638ba35263
[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours am: c0f9bb1586 -s ours am: fb84346da5 -s ours
...
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457
Change-Id: Ie4e5706a73cd044d29c74735c7790f092f5379d1
2020-09-11 21:27:17 +00:00
Xin Li
fb84346da5
[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours am: c0f9bb1586 -s ours
...
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457
Change-Id: Ia1268f61da5e8f42611c6c852526286be5fd7962
2020-09-11 03:58:48 +00:00
Xin Li
c0f9bb1586
[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours am: ea66406522 -s ours
...
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457
Change-Id: I336273f1955b0fef34ce2647888087226c630acd
2020-09-11 03:33:17 +00:00
Xin Li
ea66406522
[automerger skipped] Merge Android R am: 1303239498 -s ours am: d5da09e85f -s ours
...
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457
Change-Id: I4a04fc1f18f6992ef15e6efa2edcfafb38be50f9
2020-09-11 02:02:25 +00:00
Xin Li
d5da09e85f
[automerger skipped] Merge Android R am: 1303239498 -s ours
...
am skip reason: Change-Id Ia11f7837439c1b4f12ba51e676952659a5fb542f with SHA-1 dd810e2520 is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1422457
Change-Id: I121400cb05ba2cb83d368a5ad03120e8f2c22763
2020-09-11 00:39:45 +00: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
a27bc5af97
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours am: fe8699e8bf -s ours am: 8fd5c4948a -s ours
...
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264
Change-Id: I374c704eb51e9feca3f7d661fbe12489f7552bde
2020-09-02 01:59:12 +00:00
Xin Li
8fd5c4948a
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours am: fe8699e8bf -s ours
...
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264
Change-Id: I5d86e6a1e32bea5915330c0908b0ac3ff322b5d7
2020-09-01 22:09:45 +00:00
Xin Li
fe8699e8bf
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours am: 16525d6f36 -s ours
...
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264
Change-Id: I94b8d8c86ffa1b18706238e8383a08870d927f4c
2020-09-01 21:46:29 +00:00
Xin Li
16525d6f36
[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: dd810e2520 -s ours
...
am skip reason: Change-Id Ie84f1ff41433b8d07cf1306723e772dd598b3ccf with SHA-1 0875a1420e is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/12470264
Change-Id: I1300b2f8a0e23d18c6076c87596d82dfeda964ce
2020-09-01 20:36:54 +00: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
247c3382f1
[automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours am: 8f8f706267 -s ours am: e2c71498d1 -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: Iad6f31c8c1fd0ca27b7eb394ad9198016ba7eeef
2020-08-26 02:54:21 +00:00
Xin Li
e2c71498d1
[automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -s ours am: 8f8f706267 -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: I183efee2fcbdf5db34967eae75a12c56b659a133
2020-08-26 02:33:10 +00:00
Xin Li
8f8f706267
[automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -s ours am: 26875643c1 -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: I08396cb0a360e31ddc11e7df164626f4622918d8
2020-08-26 02:11:31 +00:00
Xin Li
26875643c1
[automerger skipped] Merge stage branch to development trunk. am: b8b866e236 -s ours am: bfb85db768 -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: I95ad0e40c35d2279a161e520d504adcf75b6d3d8
2020-08-26 00:34:35 +00: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
519e191e27
AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb am: 6f8bb7e75e am: ad68b658f9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899
Change-Id: I7d50e1f833c87a390462f1197337303c51048914
2020-07-30 02:38:08 +00:00
Raman Tenneti
ad68b658f9
AOSP/Messaging - Update language to comply with Android's inclusive language guidance. am: 4b52654e98 am: 8fe5feae57 am: 7c76d237bb am: 6f8bb7e75e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1378899
Change-Id: I9ffd9ca7f3e7b2e26f2d61e8bf03c8ab07be44b8
2020-07-30 02:17:57 +00:00