Commit Graph

1152 Commits

Author SHA1 Message Date
Xin Li
8770af9794 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours am: 96b21cc97f -s ours
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I58954b9d773b4bb974d8b1393eeff2dd45ed31c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-30 00:02:03 +00:00
Xin Li
96b21cc97f [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours am: 43050c5ad2 -s ours
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I2d2df7ef4ced6973181ee723a6ae4581f1169f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:56:19 +00:00
Xin Li
43050c5ad2 [automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: a2874315eb -s ours
am skip reason: Merged-In I81c01202306d856f6f8f8b74a5a28d7c1011fcec with SHA-1 c8e4ab2b22 is already in history

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

Change-Id: I1457040a83a4aa8289a66da4d95571bc18195390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 22:12:49 +00:00
Xin Li
a2874315eb Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Change-Id: If491aeefb40d37249174a40dfe1e37a978addf73
2022-06-27 23:39:10 +00:00
Xin Li
e004281f74 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours am: ffc5132b01 -s ours
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

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

Change-Id: I509fdb7694320add16e847b03d76d8b5a2491c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:52:45 +00:00
Xin Li
ffc5132b01 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours am: bb06e4f527 -s ours
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

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

Change-Id: I0d8771157d0c48a14cd65a13c8089a5da9b1b086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 19:56:26 +00:00
Xin Li
bb06e4f527 [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours am: c91ff4436a -s ours
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

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

Change-Id: Ie3737929b03bb869fe74c29bdba5398378f30f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:14:21 +00:00
Xin Li
c91ff4436a [automerger skipped] Merge Android 12 QPR 3 am: 41406c606f -s ours
am skip reason: Merged-In I4bdcc5893b6b437afa79f3bc138d1523c1d8431a with SHA-1 5c7e5e1755 is already in history

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

Change-Id: Iccb1cc0fb8871540c5cb8ad3f85aa0a207e5691c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-16 19:57:15 +00:00
Xin Li
41406c606f Merge Android 12 QPR 3
Bug: 236045730
Merged-In: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Change-Id: If485b9baf115a05eef5942859a54287233b3f171
2022-06-14 16:48:16 -07:00
Jake Klinker
3153a43657 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: 53ced613ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I449cf1dccdca62bc5451618a66ae43f59c5c7701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:18:08 +00:00
Jake Klinker
65d9cf0f23 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4 am: 24594cbf9d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I7a16969994fcd4c17ddaf5ccee7c04b1ee8a5817
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:17:24 +00:00
Jake Klinker
4d9ed48155 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d am: c51c783a46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic94982da7a74f5b756feb2c9169cf5757e4b8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:16:59 +00:00
Jake Klinker
c51c783a46 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I10742143b1c7e1f81a4c8f7a25ca1f949889cf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:36:07 +00:00
Jake Klinker
53ced613ab Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: a707a5cd8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I0d6e4bff6d1b3c825a72006768d16697c385271b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:36:03 +00:00
Jake Klinker
24594cbf9d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 6d643719c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: I4aad45472c767c3e9a9869f76e60009a84431707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:35:55 +00:00
Jake Klinker
a707a5cd8d Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Ic40d53b31defa115d376069d7d873bac70c5d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:18:26 +00:00
Jake Klinker
6d643719c4 Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509

Change-Id: Iace24a73bdf3f1ece511f4689198b1e28f4026c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 20:16:54 +00:00
Jake Klinker
c8e4ab2b22 Fix url:file:// style URIs from not being detected in UriUtil.
Change-Id: I81c01202306d856f6f8f8b74a5a28d7c1011fcec
Tested: Was no longer able to repro b/222091734.
Bug: 222091734
(cherry picked from commit 2283165c23)
2022-04-26 16:38:11 +00:00
Xin Li
1049de0c95 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: e469e5653c -s ours
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: Iefdf5a4be2b176421ef0796445c9e634cb60b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 09:08:48 +00:00
Xin Li
e469e5653c [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I6dbc9aa6d39a261bf40261781c92d2021b959b0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 08:30:54 +00:00
Xin Li
4c2aea615e [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I5386b5d8ce49cb196bd6ba53233e2720ebfe8425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:43:45 +00:00
Xin Li
5c7e5e1755 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours
am skip reason: Merged-In Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a with SHA-1 004f20dc0c is already in history

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

Change-Id: I4bdcc5893b6b437afa79f3bc138d1523c1d8431a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-03 07:11:44 +00:00
Xin Li
1ee3a18167 Merge Android 12 QPR3 ab/8391262
Bug: 226662282
Merged-In: Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a
Change-Id: I08874ce0b74b20d356ade7da168a56ffb129ab48
2022-04-01 20:32:45 +00:00
Aman Gupta
d55d0d42d9 Merge "Updating the DATA_ROAMING flag acceess from Settings to TelephonyManager API." into tm-dev 2022-03-25 22:01:07 +00:00
Treehugger Robot
ed04b865bb Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424 am: 004f20dc0c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021

Change-Id: I0fc636aa75c5418cd2c1812705d77419732f2fa6
2022-03-24 20:08:02 +00:00
Treehugger Robot
004f20dc0c Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021

Change-Id: Ibb6451bfe343a8696cca9c4cfdb65cfab3f1ea0a
2022-03-24 19:53:54 +00:00
Treehugger Robot
5927d48424 Merge "Correct APNs for Carolina West Wireless" am: fdd5746132
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021

Change-Id: I837ee4a2226ec471e245890fcd171c780956c598
2022-03-24 19:36:50 +00:00
Treehugger Robot
fdd5746132 Merge "Correct APNs for Carolina West Wireless" 2022-03-24 18:52:08 +00:00
Aman Gupta
f62c3cd35a Updating the DATA_ROAMING flag acceess from Settings to TelephonyManager
API.

Bug: 172467621
Test: Build
Change-Id: Ide0db6ecacaabc29b5c4c53a2868d4a2ae27c646
2022-03-24 07:03:10 +00:00
Trevor Radcliffe
f2464cdd8b Convert messaging to Soong am: d29da0298e am: 6a69f6ba16 am: 7cf78d3709
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480

Change-Id: I615c2c119b306613e3801eb26ab7a8b452933cf4
2022-03-21 18:01:28 +00:00
Trevor Radcliffe
7cf78d3709 Convert messaging to Soong am: d29da0298e am: 6a69f6ba16
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480

Change-Id: I53b6dcc17857c5b918b508e3900b23cf90f5c4a6
2022-03-21 17:45:33 +00:00
Trevor Radcliffe
6a69f6ba16 Convert messaging to Soong am: d29da0298e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480

Change-Id: I8742662ff5bc185f836064ae8025ea3de38426c6
2022-03-21 17:26:15 +00:00
Scott Dunn
d755ff51da Correct APNs for Carolina West Wireless
Change-Id: I124d7914536acbdc1454ddfaf8f0051342dd5d28
2022-03-11 01:58:12 +00:00
Trevor Radcliffe
d29da0298e Convert messaging to Soong
Fixes: 222292035
Test: APK and install location comparison. APKs differ in minor
      ways. The only unexpected ones are explained by Soong's
      opinions.

Change-Id: I366ff1861f854e30f88e65862c622d9c4586eb6a
2022-03-10 19:57:02 +00:00
Xin Li
15abda616f [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

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

Change-Id: I0e96634a2c060868fcd02a5d21270f4ed2fab6d5
2022-03-09 10:02:27 +00:00
Xin Li
4e663f05f7 [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

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

Change-Id: Ie75fb77cf964d5462299062dda15acd5c6df5ddf
2022-03-08 11:03:57 +00:00
Xin Li
184899bbeb [automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours
am skip reason: Merged-In I0f76e316e9e7f504b92e157799074e4c5606adbf with SHA-1 e6b2cd3620 is already in history

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

Change-Id: Ia35580122aba527bdd2c5b2f84fb6a4ae72e858a
2022-03-08 10:19:06 +00:00
Xin Li
e9d328d6a6 Merge Android 12L
Bug: 222710654
Merged-In: I0f76e316e9e7f504b92e157799074e4c5606adbf
Change-Id: Idad44c9d2adeb6207c021dcf5aa29049fee9020e
2022-03-08 00:19:21 +00:00
Timi Rautamäki
79c28e9449 Messaging: remove unused drawables am: e0fd216324 am: e6b2cd3620 am: 744dfca85a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356

Change-Id: I5dda7d055bd1ea612fdf668d803224b7c7fddd45
2022-02-24 23:07:13 +00:00
Timi Rautamäki
744dfca85a Messaging: remove unused drawables am: e0fd216324 am: e6b2cd3620
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356

Change-Id: I0e4c2ddfda30361966605080d426d9ad69820d99
2022-02-24 22:45:02 +00:00
Timi Rautamäki
e6b2cd3620 Messaging: remove unused drawables am: e0fd216324
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356

Change-Id: I0f76e316e9e7f504b92e157799074e4c5606adbf
2022-02-24 22:21:34 +00:00
Timi Rautamäki
e0fd216324 Messaging: remove unused drawables
Test: m
Change-Id: Ia744e9a9696fa2df94dac80e2839db8f2bb785c4
2022-02-17 13:20:50 +00:00
Xin Li
40f2450014 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5317cefc43 -s ours am: a691b0d558 -s ours
am skip reason: Merged-In I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3 with SHA-1 6e0ca56095 is already in history

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

Change-Id: I942c9338d7b3615aeb34e9b56e00baa7f222533b
2022-02-14 18:21:01 +00:00
Xin Li
a691b0d558 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 5317cefc43 -s ours
am skip reason: Merged-In I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3 with SHA-1 6e0ca56095 is already in history

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

Change-Id: I62d68395a27640e2f9efb7f2a8cd5f6e7547a4ad
2022-02-14 18:03:38 +00:00
Xin Li
5317cefc43 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Change-Id: I55e7b412d1bdf2b42ee4d06b6268c04c37a2f893
2022-02-11 06:57:43 +00:00
Jake Klinker
7c427d52ee [automerge] Use UriUtil when checking if a URI is a file. 2p: 27e27d944b am: a3f2d65241
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16764000

Change-Id: I832aa4951ae4058d3d5f41c9a696c42eefa86401
2022-02-03 01:48:00 +00:00
Jake Klinker
a3f2d65241 [automerge] Use UriUtil when checking if a URI is a file. 2p: 27e27d944b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16764000

Bug: 215212561
Change-Id: I59e1aa0f1799fb1eb993bd4e1089b665d0965099
2022-01-31 20:30:29 +00:00
Jake Klinker
27e27d944b Use UriUtil when checking if a URI is a file.
UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
2022-01-31 20:30:24 +00:00
Jake Klinker
ebc64c5bae Use UriUtil when checking if a URI is a file.
UriUtil.isFileUri contains several additional fixes, so this ensure that existing instances where we check for the file scheme use this method as well. This covers all existing instances in the app of SCHEME_FILE.

Change-Id: I1f3131b33823eae3e620aa9608be8e72b2e84aa2
Bug: 215212561
2022-01-31 20:29:42 +00:00
Jake Klinker
a0332cba4f Fix isFileUri to recognize URIs with spaces. am: 6e0ca56095 am: 391770a376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16603852

Change-Id: I14c97c261e4512e1631b90911a9c5abd1d1dd9bf
2022-01-12 01:40:57 +00:00