filab/packages_apps_Messaging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
319 Commits 1 Branch 0 Tags
24fba8cf55cee4a40ee9729aad1874b3937e5311
Commit Graph
319 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Atanas Kirilov 24fba8cf55 Merge changes from topic "am-d8363787-88bb-4e45-b57c-b18d9d8290cb" into oc-dev 
am: f7bdc8fd87

Change-Id: Id3fd43caf91de165169d1b3f2af2f1218c658d8d
 2018-05-31 20:13:28 -07:00
David Smith 26ae608af3 [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 
am: 7459ff44a0

Change-Id: Ie788e84d696b51b66553a0d5b7179899f7936817
 2018-05-31 20:13:01 -07:00
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: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58 am: 0c21193863
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596 am: 9c69271a58
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303 am: cd77076596
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182 am: ea03db3303
  [automerger] Messaging ignores file URIs shared via intent am: 9deefdf182
  Messaging ignores file URIs shared via intent
 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 7ace2d5308 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 am: 7a6b99a4a4 am: 6ea30b87b1 am: a072033ce4 am: 93d52cb5e2 am: cbed68f73b am: f9b9dc3d2f 
am: c12af8d012

Change-Id: I70465c2290a2ba08d7647acab20bdfb25e8b3ecd
 2017-07-12 19:24:50 +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

Change-Id: Ica8bedeb18ee6604e1382f54f0ad910b7cfa8c40
 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

Change-Id: I66781d5390231f55da0ead3293010a240c632ff8
 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

Change-Id: I35c5b7ee69984e1c91c63c9cf78af9d1c0e0ab43
 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

Change-Id: I2ead912804b75f6633d04259e0bdd61f2b4aad5f
 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

Change-Id: I28cfc0b9abbc28420feec7c690406ebe922b31e8
 2017-07-12 19:09:10 +00:00
Tom Taylor 6ea30b87b1 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec am: 22bbfd7360 
am: 7a6b99a4a4

Change-Id: I0817d9c8e4e30630cd0008f93ee31a728342eae1
 2017-07-12 19:07:09 +00:00
Tom Taylor 7a6b99a4a4 37742976 - Catch bad gifs am: e0f247e399 am: 7c28ca34ec 
am: 22bbfd7360

Change-Id: Ibe13d61b03cc6ae40d6782bf7ae045b5aeb491de
 2017-07-12 19:06:10 +00:00
Tom Taylor 22bbfd7360 37742976 - Catch bad gifs am: e0f247e399 
am: 7c28ca34ec

Change-Id: I0dad7e115a279290a51ee652dbd6a4f9b7ab7081
 2017-07-12 19:02:38 +00:00
Tom Taylor 7c28ca34ec 37742976 - Catch bad gifs 
am: e0f247e399

Change-Id: I54307fd0a08e1ecc14b2f3be5b8d52fac6ff7033
 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 441c8b85a6 Remove usages of ActionBarActivity. am: d3b23f568a 
am: 10244bf817

Change-Id: I8a59c98cd83c19aaa373fa1c38b26de6da1a8046
 2017-06-06 21:27:52 +00:00
Aurimas Liutikas 10244bf817 Remove usages of ActionBarActivity. 
am: d3b23f568a

Change-Id: Ia3525872e1a635f787ac6836ea961d95cc76d57f
 2017-06-06 21:24:03 +00: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
Aurimas Liutikas 11224977e7 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
 2017-05-18 11:16:47 -07:00
Tom Taylor 33e6be1db8 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev am: 7ffdc9c333 
am: a25e716645

Change-Id: I8f77c67dfc3002b2b6d5e20049e0cf715f6ff81e
 2017-05-01 18:29:30 +00:00
Tom Taylor a25e716645 Merge "37544704 PduPersister is not doing a safe Uri comparison" into oc-dev 
am: 7ffdc9c333

Change-Id: Ibfe8a044ae6dd12fbd4c204150fa410fa6867220
 2017-05-01 18:21:56 +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 7eb0aa9da9 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. am: 5aa1187f86 
am: 54abffd219

Change-Id: Ia086b18fa15351d274a07f33b48a670dbd6fa257
 2017-05-01 16:19:47 +00:00
Malcolm Chen 54abffd219 Re-define ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED, and ACTION_DEFAULT_SUBSCRIPTION_CHANGED with proper contents. 
am: 5aa1187f86

Change-Id: Ibad3f2aa34f89e75ace317a6a7945a79da8e5684
 2017-05-01 16:11:07 +00: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  -s ours

Change-Id: I286766be1fc7bf035996e3ddd21744f1334f743b
 2017-03-23 01:07:04 +00:00
Sanket Padawe dd192a650b Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. am: 56eaeedbb4 
am: efad207abc

Change-Id: Ia56cbe2705ca7db11773cb79373e64cefed56d2a
 2017-03-23 00:58:09 +00:00
Sanket Padawe efad207abc Update SubscriptionManager API by replacing 'id' & 'idx' with 'index'. 
am: 56eaeedbb4

Change-Id: I6ff74db8a3bcc83768418293a4410e1b05daa732
 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  -s ours

Change-Id: I61df8ade67a8b9ef527a89f695c1b4ee27f8303f
 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

Change-Id: I33a345152cc1c2eebc1ac7be4ee8c9649f4794a1
 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

Change-Id: Ib6053a2965920cb2487f1d697ba51d26a275eea4
 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

Change-Id: I1637b3f32e85d91c16d64ccfcb7227fb55b8dbd7
 2017-03-15 17:05:02 +00:00