Android Build Merger (Role)
7459ff44a0
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534 skipped: 69535177c6
...
Change-Id: I176da39a08831aba3f188951f9b63c81a88efa1c
2018-05-25 23:49:56 +00:00
Android Build Merger (Role)
69535177c6
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb am: 4ef3ac9534
...
Change-Id: I4b6d4b8cf2eb61e3732fc57050fde9baffa47f6d
2018-05-25 23:49:56 +00:00
Android Build Merger (Role)
4ef3ac9534
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215 am: 7ad8e75fdb
...
Change-Id: Ie8f46ce60509d742a3afb5eb441b19e956a750cd
2018-05-25 23:49:55 +00:00
Android Build Merger (Role)
7ad8e75fdb
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c am: 4fc4f4e215
...
Change-Id: I30f1daa381ac737923716cca1a8a1e2e4ec24b56
2018-05-25 23:49:54 +00:00
Android Build Merger (Role)
4fc4f4e215
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02 am: f53801c86c
...
Change-Id: I22bb03f544ba866554334a7d23e74e24cece0fb4
2018-05-25 23:49:53 +00:00
Android Build Merger (Role)
f53801c86c
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122 skipped: 520012db02
...
Change-Id: I92e620f57f6922f41227ec1a90021083e7deb388
2018-05-25 23:49:52 +00:00
Android Build Merger (Role)
520012db02
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce am: b40c396122
...
Change-Id: Ib4958d367e4e2297154af56b477121f1c8420746
2018-05-25 23:49:51 +00:00
Android Build Merger (Role)
b40c396122
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b am: a04af950ce
...
Change-Id: Ic0cdad15c75212af17359979c9f6ee36c816c0a6
2018-05-25 23:49:50 +00:00
Android Build Merger (Role)
a04af950ce
[automerger] RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent am: 0ee4c0e33b
...
Change-Id: I5895fca2ea4aff3f0de20f30ebefc9d19d9d6052
2018-05-25 23:49:49 +00:00
David Smith
0ee4c0e33b
RESTRICT AUTOMERGE: Messaging ignores file URIs shared via intent
...
Fixes b/37629504 by not creating attachments from file URIs shared via
intent. Sharing file URIs is disallowed by Android N and later and is no
longer supported for this app.
Test: manual using the Debug command added in this change
Change-Id: Iaecff745aca76381d387ab057ffa1f2024aebfcf
2018-05-25 23:49:48 +00:00
Tom Taylor
c12af8d012
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b
...
am: f9b9dc3d2f
2017-07-12 19:20:09 +00:00
Tom Taylor
f9b9dc3d2f
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2
...
am: cbed68f73b
2017-07-12 19:15:11 +00:00
Tom Taylor
cbed68f73b
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4
...
am: 93d52cb5e2
2017-07-12 19:12:40 +00:00
Tom Taylor
93d52cb5e2
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1
...
am: a072033ce4
2017-07-12 19:11:39 +00:00
Tom Taylor
a072033ce4
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4
...
am: 6ea30b87b1
2017-07-12 19:09:10 +00:00
Tom Taylor
6ea30b87b1
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360
...
am: 7a6b99a4a4
2017-07-12 19:07:09 +00:00
Tom Taylor
7a6b99a4a4
37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec
...
am: 22bbfd7360
2017-07-12 19:06:10 +00:00
Tom Taylor
22bbfd7360
37742976 - Catch bad gifs am: e0f247e399
...
am: 7c28ca34ec
2017-07-12 19:02:38 +00:00
Tom Taylor
7c28ca34ec
37742976 - Catch bad gifs
...
am: e0f247e399
2017-07-12 19:01:08 +00:00
Tom Taylor
e0f247e399
37742976 - Catch bad gifs
...
* A security researcher crafted a gif that would cause the Android
Bitmap code to throw an NPE. That would cause messaging to crash when
decoding the NPE. Catch the NPE.
Test: manually tested the "crash.gif" attached to the bug. Stepped
through the debugger to verify we're catching the NPE and logging
the attempt. Verified normal gifs still work.
Bug: 37742976
Change-Id: Iab814d5b0b514bed0cecddd9a76f1fc095f90892
(cherry picked from commit 3671fd94ae
2017-06-23 16:48:57 -07:00
Aurimas Liutikas
d3b23f568a
Remove usages of ActionBarActivity.
...
ActionBarActivity has been deprecated for 2+ years and has been
extending AppCompatActivity for all that time. These changes
should be no-ops.
Bug: 35253513
Test: None
Change-Id: I699f327aaa99b26a0a0b562cf425203e4b625c33
(cherry picked from commit 11224977e7
2017-06-06 15:13:49 +00:00
Tom Taylor
7ffdc9c333
Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev
2017-05-01 18:09:08 +00:00
Tom Taylor
db45a19fe5
37544704 PduPersister is not doing a safe Uri comparison
...
* The PduPersister had some code where it checked uris for
equality, but didn't use the safe .equals method.
Test: manual test of sending and receiving mms's.
Bug: 37544704
Change-Id: I6dfd037068b4eff04c34cd9d41760e36e11915d6
2017-05-01 09:21:52 -07:00
Malcolm Chen
5aa1187f86
Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and
...
ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents.
Bug: 37497166
Test: Manual
Change-Id: I3fb7d33fc45634ff3e9d2240e822a8945285fad2
2017-04-28 11:36:15 -07:00
Sanket Padawe
7424571ac4
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 am: efad207abc
...
am: dd192a650b
2017-03-23 01:07:04 +00:00
Sanket Padawe
dd192a650b
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4
...
am: efad207abc
2017-03-23 00:58:09 +00:00
Sanket Padawe
efad207abc
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
am: 56eaeedbb4
2017-03-23 00:45:48 +00:00
Sanket Padawe
56eaeedbb4
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
Merged-in: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21 22:32:23 +00:00
Sanket Padawe
616dc26461
Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'.
...
Bug: 35767068
Test: No build failure on update.
Change-Id: Iab619e80da63685212043f88d30c171a013f8925
2017-03-21 11:25:10 -07:00
Matt Sarett
09f7cfd826
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89 am: ebe4ce865f
...
am: 06dbece4c5
2017-03-15 17:19:34 +00:00
Matt Sarett
06dbece4c5
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016 am: ffa6f9ac89
...
am: ebe4ce865f
2017-03-15 17:14:33 +00:00
Matt Sarett
ebe4ce865f
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b am: d7b191a016
...
am: ffa6f9ac89
2017-03-15 17:10:03 +00:00
Matt Sarett
ffa6f9ac89
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5 am: 172aeda52b
...
am: d7b191a016
2017-03-15 17:05:02 +00:00
Matt Sarett
d7b191a016
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours am: 7fb08c55f5
...
am: 172aeda52b
2017-03-15 16:59:32 +00:00
Matt Sarett
172aeda52b
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314 am: cc1dbfc497 -s ours
...
am: 7fb08c55f5
2017-03-15 16:54:02 +00:00
Matt Sarett
7fb08c55f5
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec am: 93facf6314
...
am: cc1dbfc497
2017-03-15 16:49:25 +00:00
Matt Sarett
cc1dbfc497
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e am: 0cf3a7d3ec
...
am: 93facf6314
2017-03-15 16:45:22 +00:00
Matt Sarett
93facf6314
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE am: 60519c717e
...
am: 0cf3a7d3ec
2017-03-15 16:39:46 +00:00
Matt Sarett
0cf3a7d3ec
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
am: 60519c717e
2017-03-15 16:34:47 +00:00
Matt Sarett
60519c717e
Update callers *GifCloseFile for new GIFLIB DO NOT MERGE
...
Bug:34697653
Test: build; existing CTS tests
Original commit message:
Fix build breakage caused by updating giflib
Change-Id: I085379470620ec4db13f8baf7a9eb069747270b7
2017-03-15 10:15:32 -04:00
Paul Duffin
ee40b6007d
Refactor code incompatible with Mockito 2.7.13 am: d529415c68 am: 65a7c6845d
...
am: 0188c2ac3e
2017-03-10 00:08:31 +00:00
Paul Duffin
0188c2ac3e
Refactor code incompatible with Mockito 2.7.13 am: d529415c68
...
am: 65a7c6845d
2017-03-09 23:59:31 +00:00
Paul Duffin
65a7c6845d
Refactor code incompatible with Mockito 2.7.13
...
am: d529415c68
2017-03-09 23:56:06 +00:00
Paul Duffin
d529415c68
Refactor code incompatible with Mockito 2.7.13
...
Bug: 32912773
Test: make checkbuild
Change-Id: I252a7e8ae8473f0ce7e177f691aac7dfeb67e7d8
2017-03-09 18:49:41 +00:00
Paul Duffin
3dd54cd669
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469 am: 3fc616a742
...
am: 872137e536
2017-03-03 14:47:08 +00:00
Paul Duffin
872137e536
Prepare for removal of junit and android.test classes from Android API (step 1) am: e98e557469
...
am: 3fc616a742
2017-03-03 14:44:15 +00:00
Paul Duffin
3fc616a742
Prepare for removal of junit and android.test classes from Android API (step 1)
...
am: e98e557469
2017-03-03 14:41:46 +00:00
Paul Duffin
e98e557469
Prepare for removal of junit and android.test classes from Android API (step 1)
...
In preparation for removing junit and android.test classes from
the Android API this change adds explicit dependencies on junit
and/or legacy-android-test to ensure that modules will compile
properly once it is removed.
Care was taken to ensure that any targets that depended,
directly or indirectly, on android-support-test did not also
depend on junit or hamcrest as they conflict with the versions
embedded within android-support-test.
Bug: 30188076
Test: make checkbuild
Change-Id: Ic5b5b771dbc3cb5a1902cf5eb4e838a2f22c8f87
2017-03-01 13:21:11 +00:00
Tom Taylor
e0f37bb8e1
22851197 Messaging Application crash with unsupported type's URI
...
This bug and AOSP patch arrived last July. Supposedly, I
merged the change, but it's certainly not fixed in bugler, nor in various
copies of PduPersister in Android's master. Fixing all the locations
now.
Test: manual - sent/received MMS's to verify the change didn't break
existing behavior.
Bug: 22851197
Change-Id: Ia79bd9951b1820ebc42baf0eef38667753d77ab9
2017-02-23 10:41:40 -08:00
Paul Duffin
5a41083bb4
Use com.android.messaging.util.Assert instead of junit.framework.Assert am: 991c2e5ab8 am: 3cce9e3644
...
am: 613ba55900
2017-02-21 18:20:20 +00:00
