Commit Graph
1134 Commits
Author SHA1 Message Date
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 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 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 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 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 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
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
Jake Klinker 391770a376 Fix isFileUri to recognize URIs with spaces. am: 6e0ca56095
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/16603852

Change-Id: Ic248ca97e7c775e7cef298bf03cdf13c53fb9351
2022-01-12 01:22:35 +00:00
Jake Klinker 6e0ca56095 Fix isFileUri to recognize URIs with spaces.
The underlying framework recognizes " file://..." as a valid URI and fetches the file, allowing for a possible exploit (see b/209965112). This trims the URI so that we can properly recognize it as a file from within our code.

Bug: 209965112
Change-Id: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Test: See repro steps on http://b/209965112, was no longer able to repro.
2022-01-11 00:41:38 +00:00
Jake Klinker 0b258f030a Fix isFileUri to recognize URIs with spaces.
The underlying framework recognizes " file://..." as a valid URI and fetches the file, allowing for a possible exploit (see b/209965112). This trims the URI so that we can properly recognize it as a file from within our code.

Bug: 209965112
Change-Id: I8d9d9100e9a8c3bd64d19015d2177a14ec2306f3
Test: See repro steps on http://b/209965112, was no longer able to repro.
2022-01-11 00:38:25 +00:00
Xin Li f3a176524c [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours am: df1e258c61 -s ours am: 0711c6dee7 -s ours
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

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

Change-Id: Ie49c4f2c8056eaf2d004df26aa2a2e6b4b04128c
2021-12-14 22:19:35 +00:00
Xin Li 0711c6dee7 [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours am: df1e258c61 -s ours
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

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

Change-Id: Ie422ed098b0e0f8ecb0ca571c6a13f27fde7efe3
2021-12-14 21:51:10 +00:00
Xin Li df1e258c61 [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours am: 19cc2c724e -s ours
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

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

Change-Id: I0410428632a1cd93be6a68eec08e301312390b2b
2021-12-14 21:24:20 +00:00
Xin Li 19cc2c724e [automerger skipped] Merge Android 12 QPR1 am: fb6c10a89f -s ours
am skip reason: Merged-In Id864894b14fd0ab784a093ec203d31200c933f88 with SHA-1 6aa775678a is already in history

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

Change-Id: I75f77db00e6e2b0dce3aa955630e2d04421e57b9
2021-12-14 21:00:25 +00:00
Xin Li fb6c10a89f Merge Android 12 QPR1
Bug: 210511427
Merged-In: Id864894b14fd0ab784a093ec203d31200c933f88
Change-Id: I1402358d4ef814caff2bb76bed71541c3a5ead64
2021-12-14 08:39:12 -08:00
Steve Elliott f64cd7e766 add post_notification permission to manifest
so the package can send notifications on T+

Bug: 194833441
Change-Id: I760b7fce2fe23a4a2c9db3b21b4cd0e6c2c769d0
2021-12-08 19:15:31 +00:00
Xin Li 2f8be13bdf [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours am: 502d4d8558 -s ours am: c93c122f0e -s ours
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: I94e7dd3c69279eed12ff94f02b7b17570bd9878e
2021-11-18 04:11:56 +00:00
Xin Li c93c122f0e [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours am: 502d4d8558 -s ours
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: I74a8c185f249d969ead5d43cd637ade304f22841
2021-11-18 03:52:41 +00:00
Xin Li 502d4d8558 [automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 6aa775678a -s ours
am skip reason: Merged-In I54b996561d0248a4636e0991545cbfc0700e1ee4 with SHA-1 8a9e12764a is already in history

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

Change-Id: Ifc6d8976c3bb9bfffd308dac45c5c8b41172ccc4
2021-11-18 03:37:17 +00:00
Xin Li 6aa775678a Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I54b996561d0248a4636e0991545cbfc0700e1ee4
Change-Id: Id864894b14fd0ab784a093ec203d31200c933f88
2021-11-10 08:06:09 +00:00
Jake Klinker 9c2b23d699 Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 92ce418906 am: c81f5c1bab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I811c332788832b2e79bec9b09fe66635d1cdb696
2021-10-07 05:58:21 +00:00
Jake Klinker 756a53967d Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 8a9e12764a am: 58ad3740df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I8b091551d96e91dcdb57110c92d4e465537d3b22
2021-10-07 05:58:15 +00:00
Jake Klinker c81f5c1bab Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 92ce418906
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I060a8878e5b0ee6d62cc57c849c2ab0a898657fe
2021-10-07 05:43:44 +00:00
Jake Klinker 58ad3740df Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e am: 8a9e12764a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I8130588d8612124f3b827a93e44f242042edebf2
2021-10-07 05:42:16 +00:00
Jake Klinker 92ce418906 Convert URI scheme to lower case before checking if it is a file. am: 58ee29c68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998887

Change-Id: I807f76373239f2aceedde821b654ce9de26ecd86
2021-10-07 05:33:56 +00:00