Commit Graph
1086 Commits
Author SHA1 Message Date
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 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 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 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
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
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 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 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
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
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 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 a7ba2de9b4 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 019fc1f23a am: 3ca1a1a297 am: bb332a23ff
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1682068

Change-Id: If6ecde49bbfbbd163f59e28bb32e2587ad8a41f1
2021-04-21 20:01:08 +00:00
Bob Badour bb332a23ff [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 019fc1f23a am: 3ca1a1a297
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1682068

Change-Id: If545d3dfec39eb2f5834d9badc51552b9d998024
2021-04-21 19:28:07 +00:00
Bob Badour 3ca1a1a297 [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging am: 019fc1f23a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1682068

Change-Id: I872b4ee494b7f08ec79cfbd94df6c61f94ffef46
2021-04-21 19:01:41 +00:00
Bob Badour 019fc1f23a [LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Messaging
Added SPDX-license-identifier-Apache-2.0 to:
  tests/Android.mk

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD
    SPDX-license-identifier-MIT
to:
  Android.mk

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I199886dd90a65c483a4f9782b5c77ffa5ecc3606
2021-04-20 14:03:49 -07:00
Raman Tenneti c5c95ab825 Merge "Signed-off-by: Yusuke <yusuke.furuya@rakuten.com> Add: MMS config file for Rakuten Mobile MNO" am: 594aaaf10d am: bb219ee2ef am: ec4773c514
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1615180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a6c01b7ee63a6bde17c49075cf31fd8f41eb6d8
2021-03-05 07:49:24 +00:00
Raman Tenneti ec4773c514 Merge "Signed-off-by: Yusuke <yusuke.furuya@rakuten.com> Add: MMS config file for Rakuten Mobile MNO" am: 594aaaf10d am: bb219ee2ef
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1615180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia255394dc41288f22dd753ea300ac24e41c7c16f
2021-03-05 07:23:09 +00:00
Raman Tenneti bb219ee2ef Merge "Signed-off-by: Yusuke <yusuke.furuya@rakuten.com> Add: MMS config file for Rakuten Mobile MNO" am: 594aaaf10d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Messaging/+/1615180

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I518b5be8e5d6adff6c1cc8b4e3ffe5c943f22d3d
2021-03-05 06:35:38 +00:00
Raman Tenneti 594aaaf10d Merge "Signed-off-by: Yusuke <yusuke.furuya@rakuten.com> Add: MMS config file for Rakuten Mobile MNO" 2021-03-05 05:59:58 +00:00
Yusuke c1275efbfd Signed-off-by: Yusuke <yusuke.furuya@rakuten.com>
Add: MMS config file for Rakuten Mobile MNO

Added MMS config file for Rakuten Mobile MNO to define maxMessageSize, maxImageHeight and maxImageWidth.

Bug: 180193973
Bug: 180247421
Test: no testing
Change-Id: I93519f549220a4c200dfaa06a24bf9d5ae211e29
2021-03-04 23:07:20 +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