Commit Graph

247291 Commits

Author SHA1 Message Date
Jeff Sharkey
fdef2cd87d Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev 2016-12-02 18:10:10 +00:00
TreeHugger Robot
73b49fc7e8 Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev 2016-12-02 01:51:49 +00:00
Jeff Sharkey
52a98daa1a DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours am: 60cc001b28 am: a0b41fca40 am: 793c3b14df
am: cfa18212ff  -s ours

Change-Id: I9b99f86f7703a960154859f1824c21edae0515d4
2016-12-02 01:36:30 +00:00
Jeff Sharkey
cfa18212ff DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours am: 60cc001b28 am: a0b41fca40
am: 793c3b14df

Change-Id: Ieb6c0ded58178120a8407efd023a190648db8c08
2016-12-02 01:24:37 +00:00
Jeff Sharkey
60f17b8505 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3
am: f70dd1fbc1  -s ours

Change-Id: Ie3be31b7010a3fae500b547fde31056084b3e2b7
2016-12-02 01:18:49 +00:00
Jeff Sharkey
793c3b14df DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours am: 60cc001b28
am: a0b41fca40

Change-Id: I12241d8c7c843c63981dfda795f99c8d18634d74
2016-12-02 01:18:27 +00:00
Jeff Sharkey
18ade37c6b Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev
am: 32d2b4c7af  -s ours

Change-Id: Id4cf3526f7892971e4f226e98036166cbe8d28ef
2016-12-02 01:14:27 +00:00
Jeff Sharkey
d9a7f11334 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f084ccd48d  -s ours

Change-Id: I9b4630b18d52ad503b88380c1a853bf3c0b46a10
2016-12-02 01:14:23 +00:00
Jeff Sharkey
e94d76436b DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4
am: 50102e63da  -s ours

Change-Id: I3a587cb124b30ef5062600e7ba870da58213a094
2016-12-02 01:13:18 +00:00
Jeff Sharkey
f70dd1fbc1 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723 am: af5f47caca
am: ee8e0e8ae3

Change-Id: I24fd90b2e61aabe95ccc5891c02fbbe2c795ba18
2016-12-02 01:13:13 +00:00
Jeff Sharkey
a0b41fca40 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d am: 8bd3aa70ad -s ours
am: 60cc001b28

Change-Id: Ic21f6cc9072ae65ba67f117a21c4703e8f8cf6ea
2016-12-02 01:13:04 +00:00
TreeHugger Robot
32d2b4c7af Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev 2016-12-02 01:10:36 +00:00
Jeff Sharkey
a24a33490a DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220 am: 2d549764be
am: b981c3be70  -s ours

Change-Id: I22fe97ae93c6e665288d46c29429ca7690352fb3
2016-12-02 01:07:07 +00:00
Jeff Sharkey
ee8e0e8ae3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours am: 1da786d723
am: af5f47caca

Change-Id: Idc1de786eee9966a0d555affdb2ac41fa134eb55
2016-12-02 01:06:56 +00:00
Jeff Sharkey
50102e63da DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b
am: 061e7313b4

Change-Id: If0723e8cb1484263a3b96b37d21132d2ebc9b1b5
2016-12-02 01:06:56 +00:00
Jeff Sharkey
60cc001b28 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours am: 704085119d
am: 8bd3aa70ad  -s ours

Change-Id: I3ef5d68391566fc428906799a6ec6d166b9479a4
2016-12-02 01:01:52 +00:00
Jeff Sharkey
af5f47caca DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675 -s ours
am: 1da786d723

Change-Id: I09b766396a8334551917723a47d5bba2590cb2bd
2016-12-02 01:01:51 +00:00
Jeff Sharkey
b981c3be70 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: fbf395c220
am: 2d549764be

Change-Id: Iad255e684d36524388a659181da0535bd15e37dc
2016-12-02 01:01:49 +00:00
Jeff Sharkey
061e7313b4 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3
am: 3e0d93036b

Change-Id: Ice0b80b96cdd7ad1a7691919982d98266a37f8bf
2016-12-02 01:01:49 +00:00
Jeff Sharkey
1da786d723 DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2
am: b9a0b79675  -s ours

Change-Id: I82040d83bc780656b5deaa4fbe664700567e2138
2016-12-02 00:56:36 +00:00
Jeff Sharkey
8bd3aa70ad DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f279a5bc0d -s ours
am: 704085119d

Change-Id: Ic687581a9bf5f0906cdb7642e59b81d9b6175aca
2016-12-02 00:56:32 +00:00
Jeff Sharkey
3e0d93036b DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 3b0aa060a3

Change-Id: I3ba9a8dedfda4d878b99cc7de8a41418d424495c
2016-12-02 00:56:31 +00:00
Jeff Sharkey
2d549764be DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: fbf395c220

Change-Id: I453445723ea9f6124d876dc32c6defab42432351
2016-12-02 00:56:26 +00:00
Jeff Sharkey
b9a0b79675 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: 1de465bec2

Change-Id: I14f82fa9c555bea0e71553713436a6836a421691
2016-12-02 00:50:29 +00:00
Jeff Sharkey
704085119d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am: f279a5bc0d  -s ours

Change-Id: I7fde8a3cd529bc495aa7e886988d73e22815c0b4
2016-12-02 00:50:27 +00:00
Jeff Sharkey
17010dc0d2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-02 00:05:40 +00:00
Jeff Sharkey
f279a5bc0d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:54:50 +00:00
Jeff Sharkey
1de465bec2 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:54:04 +00:00
Jeff Sharkey
f084ccd48d DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:51:49 +00:00
Jeff Sharkey
fbf395c220 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 23:51:25 +00:00
Jeff Sharkey
3b0aa060a3 DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
As part of fixing a recent security issue, DownloadManager now needs
to issue Uri permission grants for all downloads.  However, if an app
that requested a download is upgraded or otherwise force-stopped,
the required permission grants are removed.

We could tell DownloadManager about the app being stopped, but that
would be racy (due to background broadcast), and waking it up would
degrade system health.  Instead, as a special case we now only
consider clearing DownloadManager permission grants when app data
is being cleared.

Bug: 32172542, 30537115
Test: builds, boots, app upgrade doesn't clear grants
Change-Id: I7e3d4546fd12bfe5f81b9fb9857ece58d574a6b9
(cherry picked from commit 23ec811266)
2016-12-01 16:50:29 -07:00
Scott Main
c8b11fb7cb Add cross-links between FINE and COARSE location permissions. bug: 25371600
am: 3fef783359

Change-Id: I7a7e25c37fcd7863f51ea116f624d0bdc2d0c5c6
2016-11-18 15:17:06 +00:00
Jeff Sharkey
11e3e52bd9 DO NOT MERGE: Check provider access for content changes.
For an app to either send or receive content change notifications,
require that they have some level of access to the underlying
provider.

Without these checks, a malicious app could sniff sensitive user data
from the notifications of otherwise private providers.

Test: builds, boots, PoC app now fails
Bug: 32555637
Change-Id: If2dcd45cb0a9f1fb3b93e39fc7b8ae9c34c2fdef
2016-11-17 21:01:43 +00:00
Scott Main
3fef783359 Add cross-links between FINE and COARSE location permissions.
bug: 25371600

Change-Id: I7af21b063533085ce20c51d18f118c7752fd77f0
(cherry picked from commit b18745616f)
2016-11-16 04:08:16 +00:00
Andriy Naborskyy
fb4beac069 Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev am: 11da2b5de3 -s ours
am: 3f39609cff  -s ours

Change-Id: I2d9f5bf351026cd697b75b1c60a177232cdb2266
2016-11-14 13:09:40 +00:00
Andriy Naborskyy
dbbde14239 DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous" am: c5bf8bc74d -s ours
am: f380f53752  -s ours

Change-Id: I2b6441bfb380c443199a72ea61044a5480d93324
2016-11-14 13:08:23 +00:00
Brian Carlstrom
f9150bf362 Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev am: 5d0cabf78e am: 3be5dec18a
am: b272d7cb13

Change-Id: If3d7584fef21c97c9dd9350b385c86bd0dfc1231
2016-11-14 13:07:09 +00:00
Narayan Kamath
479385b6b3 Zygote : Block SIGCHLD during fork. am: b6f3751599 am: b23e864573
am: 52021073a4

Change-Id: I2d82df99a5c2c4e3c7df0f54638531fb67271e25
2016-11-14 13:05:54 +00:00
Narayan Kamath
f3f784853d Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79 am: 50b0c3be57 -s ours am: e1e735bcb9 am: 072b70bae3
am: ba6d5ee377

Change-Id: Id7fefda1a09fc4af9232cd1acb28092c2fd1b93c
2016-11-14 13:04:33 +00:00
Narayan Kamath
2c13554c18 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc am: 83b46a1590 am: 330d0ebf48 am: 21c1e58090
am: 81fd9e618c

Change-Id: I1a30989e0fd2ced4a7e298ae26e76f3525c03362
2016-11-14 13:03:02 +00:00
Narayan Kamath
3b89a68a08 Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f am: f8335b6a59 am: 2f8ce5f5cb am: 5515b415aa
am: d212aa9d13

Change-Id: I477b2582bd31e1f9d1b53ea6bfdad78267fc6bfc
2016-11-14 13:01:42 +00:00
Narayan Kamath
1f9abe310f Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375 am: 5594cfc2c3 am: 6ca924b884 am: ae457e03b7
am: 0c8da8aa05

Change-Id: Iaa46542e0484c3a9e175f492790583482b4f088b
2016-11-14 13:00:21 +00:00
Narayan Kamath
4a204149eb Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours am: 4c26a969e9 am: b7884e5a9f am: da65c74c54
am: 24b2a54a84

Change-Id: I11ecc3013e1de3951b12945c486cca7ad78d38ed
2016-11-14 12:59:01 +00:00
neo.chae
0212d4f3fa Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16 am: b4b2203c5e am: fb74b8773a am: c58ec27e1c
am: 7489336fed

Change-Id: I53fb00542e417e200b46ac941b4255e310348e18
2016-11-14 12:57:53 +00:00
Xin Li
ee6b51a05b Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev am: 78f15948fb am: 34de2a2d45 -s ours am: a5c82e7dd9 am: ca2abc5b71 am: ae5db8a6dc
am: db984f917c  -s ours

Change-Id: Ib1df6a08c3f6a2e379f7d4ffac944c2169336f11
2016-11-14 12:56:36 +00:00
Xin Li
05a61276c6 Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev. am: 7e0483fcec -s ours am: 16090c6177 -s ours am: 0a568ae56e am: 9788dd5bd2 am: 6ec8dd10bb
am: 921dd6a5fd  -s ours

Change-Id: Iffc4ed4a45701d533a0b6d24daaa137982554057
2016-11-14 12:55:17 +00:00
Narayan Kamath
11b3161c41 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am: 75c6b8c324 am: 9958eb7180 am: 5e92ece8c2
am: 77decadefe

Change-Id: I41f78ad8e6d669cb1e038480adfd9d12a469500c
2016-11-14 12:54:10 +00:00
Narayan Kamath
87dc13f249 Zygote: Additional whitelisting for legacy devices. am: 5e2f7c6229 am: 6bf96c1192 am: 22e45fa247
am: d98e75feca

Change-Id: Ic63a80f3a591956fd82a223c74050a24d7805add
2016-11-14 12:52:53 +00:00
Narayan Kamath
65abe1066d Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am: b3b03a9d78 am: ba23956c45 am: a20eebfab7
am: 8e6e5a157b

Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
2016-11-14 12:51:41 +00:00
Narayan Kamath
59e6dccb4c Zygote: Additional whitelists for runtime overlay / other static resources. am: 4e8ba1d73e am: d501e032d8 am: 932cd0ed0e
am: d17867203b

Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
2016-11-14 12:50:15 +00:00