Commit Graph

1107 Commits

Author SHA1 Message Date
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
Jake Klinker
8a9e12764a 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: I54b996561d0248a4636e0991545cbfc0700e1ee4
2021-10-07 05:33:56 +00:00
Jake Klinker
f93fcd5945 Convert URI scheme to lower case before checking if it is a file. am: 56bacbcb13 am: f40ef350b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998907

Change-Id: I49320ad77b19a9792d787590403d7eacf2d91b37
2021-10-07 05:04:12 +00:00
Jake Klinker
f40ef350b4 Convert URI scheme to lower case before checking if it is a file. am: 56bacbcb13
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Messaging/+/15998907

Change-Id: I708af5f19396bfcbbd6ee0ccea4f38c19c3c4dae
2021-10-07 04:53:55 +00:00
Jake Klinker
56bacbcb13 Convert URI scheme to lower case before checking if it is a file.
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
(cherry picked from commit 9607c95e71)
2021-10-06 22:38:45 +00:00
Jake Klinker
58ee29c68e Convert URI scheme to lower case before checking if it is a file.
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
(cherry picked from commit 9607c95e71)
2021-10-06 22:38:04 +00:00
Jake Klinker
9607c95e71 Convert URI scheme to lower case before checking if it is a file.
This fixes an edge case where a "File://" style URI could be passed in
but not pass this check, even though the underlying framework recognizes
this as a legitimate file.

Bug: 197328178
Test: See repro steps on http://b/197328178, was no longer able to
repro.

Change-Id: Id837744a79d1aca91b41d24207dc9b98f2b5b5e9
2021-10-06 21:17:05 +00:00
Santiago Seifert
9f113182be Merge "Handle MediaMetadataRetriever.release IOException" 2021-10-05 19:51:27 +00:00
Timi Rautamäki
2b8f604025 Messaging: allow selecting text inside the selected message am: 78ecab8743 am: 476671be4a am: 1abe606ee5 am: db5364911f am: 5062902b35
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1754232

Change-Id: I688920a14987fc455b20d22266200e8387fc90f6
2021-09-24 17:25:25 +00:00
Timi Rautamäki
5062902b35 Messaging: allow selecting text inside the selected message am: 78ecab8743 am: 476671be4a am: 1abe606ee5 am: db5364911f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1754232

Change-Id: I98e77b40dfe6b3d88af831a2ca9b1dfa6d7c980e
2021-09-24 17:00:39 +00:00
Timi Rautamäki
db5364911f Messaging: allow selecting text inside the selected message am: 78ecab8743 am: 476671be4a am: 1abe606ee5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1754232

Change-Id: Ib4952cb4baa62806955f83b2163baf0ea781b6da
2021-09-24 16:44:52 +00:00
Timi Rautamäki
1abe606ee5 Messaging: allow selecting text inside the selected message am: 78ecab8743 am: 476671be4a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1754232

Change-Id: I8a024997cd367b55fa38bfdfb9b6119db1ac25ad
2021-09-24 16:32:20 +00:00
Timi Rautamäki
476671be4a Messaging: allow selecting text inside the selected message am: 78ecab8743
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1754232

Change-Id: Ibaefc53a73ce8d28633fce26715c01616c3297a2
2021-09-24 16:17:53 +00:00
Santiago Seifert
c4ce65c11e Handle MediaMetadataRetriever.release IOException
MediaMetadataRetriever.release now declares a thrown IOException.

Bug: 200173116
Test: Should be a non-functional change (only relevant when using MediaDataSource).
Change-Id: Ia3f5f01ee79feb35a10ec8bbbef6db88b32f2161
2021-09-22 10:56:34 +00:00
Timi Rautamäki
78ecab8743 Messaging: allow selecting text inside the selected message
Test: receive a message, select it by long press, verify text is selectable.
Change-Id: I9f80df970c6ee1c06b8056c78bffe942eb8eb9bf
Signed-off-by: Timi Rautamäki <timi.rautamaki@gmail.com>
2021-09-19 20:10:11 +00:00
Yuntao Xu
748b753771 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81 am: 60df1d5e29 am: c1ac858c53
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: Ia9dfd25d6db6d641c258046caa007a223d914078
2021-05-17 13:44:58 +00:00
Yuntao Xu
19b7edcbe8 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81 am: c56055154f am: 009a56d6d0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: Ic699245a9abdcad262e90945d375094ead1474d9
2021-05-17 13:37:36 +00:00
Bob Badour
baa5711dba [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 019fc1f23a am: 3ca1a1a297 am: bb332a23ff am: a7ba2de9b4 am: ac5a646341
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1682068

Change-Id: I0c8d828762963aaf7df3f8c767543be6994380eb
2021-05-16 10:20:19 +00:00
Yuntao Xu
c1ac858c53 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81 am: 60df1d5e29
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: Ie310d0425ed3526e64dd0bd70fd94c9992ef59ee
2021-05-15 14:25:23 +00:00
Yuntao Xu
009a56d6d0 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81 am: c56055154f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: Ife56d5d5fb602101499d5d3c9dafdf5b1d390aab
2021-05-12 00:10:57 +00:00
Yuntao Xu
c56055154f Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I70d42963f9074de25ed8fc12706d29e4b3fd011f
2021-05-11 23:58:10 +00:00
Yuntao Xu
dfbdcae060 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I4f12ddab41f946d662ab4b8822baa6f307322706
2021-05-11 23:56:17 +00:00
Yuntao Xu
60df1d5e29 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010 am: 7f113e2a81
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I9d43d6695a9e305b80db2b49c3b61548dd9a66e1
2021-05-11 23:56:16 +00:00
Yuntao Xu
7f113e2a81 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0 am: 3369678010
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I3472f2a8bc771252bb36a25dd93750734823b1d2
2021-05-11 23:43:46 +00:00
Yuntao Xu
3369678010 Convert jni/Android.mk to Android.bp am: e60c364968 am: 20d8640ba0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I16955005e113e03c24bed88af249d2b05b714e5e
2021-05-11 23:17:35 +00:00
Yuntao Xu
20d8640ba0 Convert jni/Android.mk to Android.bp am: e60c364968
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1699267

Change-Id: I0c3cac624e3a8a9b0c395449bf831719fb86184c
2021-05-11 23:02:16 +00:00
Yuntao Xu
e60c364968 Convert jni/Android.mk to Android.bp
Convert the Make file to a Soong one

Bug: 186641883
Test: compared the results built by Make and Soong
Test: TreeHugger
Change-Id: I81f3acffc8b7157cf3d8a5edfce25ecdbf9ca742
2021-05-06 18:48:43 -07:00
Bob Badour
ac5a646341 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 019fc1f23a am: 3ca1a1a297 am: bb332a23ff am: a7ba2de9b4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1682068

Change-Id: Iaeb661e86140450fabd8a1bc6dc59737c00b8a34
2021-04-21 20:21:46 +00:00