Jake Klinker
c5961c337d
Fix url:file:// style URIs from not being detected in UriUtil. am: c8e4ab2b22 am: 682ab534f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17957509
Change-Id: I0a4645306d5ab011c7b5dd9e84b93de1e8443c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 20:35:12 +00:00
Jake Klinker
682ab534f6
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: I963d72306df114e57364b3e3ed3519eab7ace1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-27 20:17:19 +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
Jake Klinker
2283165c23
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
2022-04-21 18:35:50 +00:00
Xin Li
daf72d8edc
[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: 1049de0c95 -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: Idab5311021bc07254d31257b7defc3439501a252
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-03 09:38:57 +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
293a512c88
[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1ee3a18167 -s ours am: 5c7e5e1755 -s ours am: 4c2aea615e -s ours am: 68710ada8e -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: Ib1fff9fffd69d1efb1b1409a27e78b0d8c012ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-03 09:00:33 +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
68710ada8e
[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: I4aa7de25379c42fd9a608e43bb1ad4ae4baae8dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-03 08:29:39 +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
87968a3c22
Merge "Updating the DATA_ROAMING flag acceess from Settings to TelephonyManager API." into tm-dev am: d55d0d42d9 am: eef99b798c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17343683
Change-Id: I90bdc9f869f837e5136f73bee4497e1040191fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:26:37 +00:00
Aman Gupta
547005f465
Merge "Updating the DATA_ROAMING flag acceess from Settings to TelephonyManager API." into tm-dev am: d55d0d42d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17343683
Change-Id: I68a0141b66b9230cc0a66b20246f13dadee3a043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:25:08 +00:00
Aman Gupta
eef99b798c
Merge "Updating the DATA_ROAMING flag acceess from Settings to TelephonyManager API." into tm-dev am: d55d0d42d9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/17343683
Change-Id: I63ef0ee2606d42bb4b712dd77fa0a19fd48263be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-03-25 22:25:04 +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
de62aafea3
Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424 am: 004f20dc0c am: ed04b865bb am: c9f556473a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021
Change-Id: I8238c05b14ab0fe5743d38b81e8cbf95abd7aedf
2022-03-24 20:36:27 +00:00
Treehugger Robot
c9f556473a
Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424 am: 004f20dc0c am: ed04b865bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021
Change-Id: I2ea3b3152bf577619272e4f1f99eb9db2dbab6d3
Signed-off-by: Automerger Merge Worker
2022-03-24 20:21:57 +00:00
Treehugger Robot
cb0e84dd82
Merge "Correct APNs for Carolina West Wireless" am: fdd5746132 am: 5927d48424 am: 004f20dc0c am: ed04b865bb
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2021021
Change-Id: I4718e16ee75bc2b1df8ae969efc8201e1fed612d
Signed-off-by: Automerger Merge Worker
2022-03-24 20:21:44 +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
d30ffd574e
Convert messaging to Soong am: d29da0298e am: 6a69f6ba16 am: 7cf78d3709 am: f2464cdd8b am: 88d86d0860
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480
Change-Id: I6fc1827bf45cf7f620f8730fae770c346cef86dd
2022-03-21 19:35:25 +00:00
Trevor Radcliffe
8f96198f72
Convert messaging to Soong am: d29da0298e am: 6a69f6ba16 am: 7cf78d3709 am: f2464cdd8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480
Change-Id: I489bfb39b93ddad1c28d9b74ec8df8fe3bc5f633
2022-03-21 18:30:19 +00:00
Trevor Radcliffe
88d86d0860
Convert messaging to Soong am: d29da0298e am: 6a69f6ba16 am: 7cf78d3709 am: f2464cdd8b
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/2018480
Change-Id: I26ae5c10707e9a51002271e429021ab731eb7dfb
2022-03-21 18:28:51 +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
f4ec8cecd3
[automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -s ours am: efe9757e30 -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: I8999ccf608a23b5764e61969c97245a6f195c6ee
2022-03-09 12:06:29 +00:00
Xin Li
150f45c98e
[automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -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: Id52fbeab93c4ef4019cd82e9b2a57b0706a45908
2022-03-09 11:36:37 +00:00
Xin Li
efe9757e30
[automerger skipped] Merge Android 12L am: e9d328d6a6 -s ours am: 184899bbeb -s ours am: 4e663f05f7 -s ours am: 15abda616f -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: I162db491d7700f35434f407918282506226550aa
2022-03-09 11:36:23 +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
e2a7695a75
Messaging: remove unused drawables am: e0fd216324 am: e6b2cd3620 am: 744dfca85a am: 79c28e9449 am: 706bc4f33e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356
Change-Id: I1fa59beca0396f68cd1c6ddf83e34789fd291c5f
2022-02-25 04:24:57 +00:00
Timi Rautamäki
61dfb27d1f
Messaging: remove unused drawables am: e0fd216324 am: e6b2cd3620 am: 744dfca85a am: 79c28e9449
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356
Change-Id: I23e3f9738f5fa081929d742d420ff0e35197b325
2022-02-25 04:06:10 +00:00
Timi Rautamäki
706bc4f33e
Messaging: remove unused drawables am: e0fd216324 am: e6b2cd3620 am: 744dfca85a am: 79c28e9449
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1988356
Change-Id: I630867560d046924e59cf8ce0eeb314dea08201d
2022-02-24 23:31:09 +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