Atanas Kirilov
f7bdc8fd87
Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev
...
* changes:
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182ea03db3303cd770765969c69271a580c211938639deefdf182ea03db3303cd770765969c69271a589deefdf182ea03db3303cd770765969deefdf182ea03db33039deefdf182
2018-06-01 00:19:17 +00:00
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
Android Build Merger (Role)
870a173e43
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863
...
Change-Id: Ifd8f26ed2cfc372c039fffa192a49293f234890b
2018-05-25 23:24:07 +00:00
Android Build Merger (Role)
0c21193863
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58
...
Change-Id: I065b687f72fdb648e9713b5cb9a2f66bac69670b
2018-05-25 23:24:06 +00:00
Android Build Merger (Role)
9c69271a58
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596
...
Change-Id: Ic9ff8359dbaf3dbfeaffec4c6e2247dab1592fa3
2018-05-25 23:24:05 +00:00
Android Build Merger (Role)
cd77076596
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303
...
Change-Id: Id7cb823cf94fc1d52b278264355c47043e12b0d6
2018-05-25 23:24:04 +00:00
Android Build Merger (Role)
ea03db3303
[automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
...
Change-Id: Ieaca25fa19b578953f88da445e2ecbd4b15f3a98
2018-05-25 23:24:03 +00:00
David Smith
9deefdf182
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: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
Merged-In: Ibff486c94ac703a9a4c5a80e33b934a460804a8f
2018-05-25 23:24:02 +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
