Commit Graph

201424 Commits

Author SHA1 Message Date
Jeff Sharkey
37ff2d56bf Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2 am: 920b02a94f -s ours
am: aff9286bd6

Change-Id: I4f117247986cfa72156d26af917ba1bae6e9fa9b
2016-12-02 18:56:56 +00:00
Jeff Sharkey
5267b63325 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa am: a1d1ecbe05 -s ours
am: 928c09cd8e

Change-Id: Ic470197dcc815e7ecf6b47dfd74ff6f4f74f1804
2016-12-02 18:56:01 +00:00
Jeff Sharkey
c130d7fd5e Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14 am: a7efe16fe1 -s ours
am: f1085f2dc8

Change-Id: I565994dc5bbfc11b3293cb77aabca77b908a9039
2016-12-02 18:55:07 +00:00
Jeff Sharkey
8b5fa0c0c0 DO NOT MERGE. Check provider access for content changes. am: 91add43ae7 am: 792d49dfb5 -s ours
am: 32af84320b

Change-Id: I73fe93944c2c2aebca02ca85d441905c2075bc65
2016-12-02 18:53:57 +00:00
Jeff Sharkey
aff9286bd6 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours am: ce477912a2
am: 920b02a94f  -s ours

Change-Id: I3c2b9ba49785b40df3960fac4ffb17204cab063a
2016-12-02 18:40:25 +00:00
Jeff Sharkey
928c09cd8e DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours am: 9277cce7fa
am: a1d1ecbe05  -s ours

Change-Id: I6d4f8a29537e19545bf94a886aecea8ba05a6de7
2016-12-02 18:39:20 +00:00
Jeff Sharkey
f1085f2dc8 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev am: 6b89229d14
am: a7efe16fe1  -s ours

Change-Id: I17b84f1e8d8432292568c0adb2b3d89563a72b50
2016-12-02 18:38:01 +00:00
Jeff Sharkey
32af84320b DO NOT MERGE. Check provider access for content changes. am: 91add43ae7
am: 792d49dfb5  -s ours

Change-Id: I50ab47cb03b65cc8be78c9a139561e4befbb1a95
2016-12-02 18:36:33 +00:00
Jeff Sharkey
920b02a94f Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev am: ae7d4b1339 -s ours
am: ce477912a2

Change-Id: I1f05c5204e6ba49a95a8b21cb457b04fe6738cb0
2016-12-02 18:30:18 +00:00
Jeff Sharkey
a1d1ecbe05 DO NOT MERGE. Check provider access for content changes. am: 9b85862620 -s ours
am: 9277cce7fa

Change-Id: I5cdc35759ad40566c02db6ee725c199ae255b5b8
2016-12-02 18:29:19 +00:00
Jeff Sharkey
a80cbeeee2 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev
am: 8e14278209

Change-Id: I31e403ccc5207073d327a144f9b82fb93e01b865
2016-12-02 18:20:02 +00:00
Jeff Sharkey
a7efe16fe1 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev
am: 6b89229d14

Change-Id: I8f09aaed1be7f86cfb0a2cbe91ae5b4fe881df07
2016-12-02 18:19:56 +00:00
Jeff Sharkey
ce477912a2 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev
am: ae7d4b1339  -s ours

Change-Id: Idc5d7d7d695db9ac7e7007447c89ca0466ea158b
2016-12-02 18:19:53 +00:00
Jeff Sharkey
792d49dfb5 DO NOT MERGE. Check provider access for content changes.
am: 91add43ae7

Change-Id: I158a5dab0643fb5d2c07393f0df030e93b3c006a
2016-12-02 18:19:51 +00:00
Jeff Sharkey
9277cce7fa DO NOT MERGE. Check provider access for content changes.
am: 9b85862620  -s ours

Change-Id: I2a67bbde8b3e131ba62cedd0b6629912e226ba90
2016-12-02 18:19:50 +00:00
Jeff Sharkey
190e20c2b5 DO NOT MERGE: Check provider access for content changes.
am: 4ddbf942a0

Change-Id: I9895591df11a2416cd3191ac9c790ecac167ece5
2016-12-02 18:19:50 +00:00
Jeff Sharkey
6b89229d14 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-mr1-dev 2016-12-02 18:10:16 +00:00
Jeff Sharkey
ae7d4b1339 Merge "DO NOT MERGE. Check provider access for content changes." into lmp-dev 2016-12-02 18:10:15 +00:00
Jeff Sharkey
48f6bdfce4 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev 2016-12-02 18:10:14 +00:00
Jeff Sharkey
8e14278209 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev 2016-12-02 18:10:11 +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
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
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
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
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
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
Jeff Sharkey
91add43ae7 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-18 15:37:57 -07:00
Jeff Sharkey
9b85862620 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-18 15:37:08 -07:00
Jeff Sharkey
ff2fede0dd 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:02:40 +00:00
Jeff Sharkey
4ddbf942a0 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:02:37 +00:00
Brian Carlstrom
5d0cabf78e Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev 2016-11-11 04:03:02 +00:00
Narayan Kamath
e1e735bcb9 Zygote : Block SIGCHLD during fork. am: b1f1209d9a am: 35b8453338 am: 14bd75fa79
am: 50b0c3be57  -s ours

Change-Id: I745d1c8e0066b0a7864d931b268b04a9458c7984
2016-11-11 01:56:28 +00:00
Narayan Kamath
b6f3751599 Zygote : Block SIGCHLD during fork.
We close the android logging related sockets prior as late as possible
before every fork to avoid having to whitelist them. If one of the
zygote's children dies after this point (but prior to the fork), we can
end up reopening the logging sockets from the SIGCHLD signal handler.

To prevent this from happening, block SIGCHLD during this critical
section.

Bug: 32693692
Test: Manual

(cherry picked from commit e9a525829a)

Zygote: Unblock SIGCHLD in the parent after fork.

Follow up to change e9a525829a. Allows the zygote to
receive SIGCHLD again and prevents the zygote from getting into a
zombie state if it's killed.

Contributed-By: rhed_jao <rhed_jao@htc.com>
Bug: 32693692
Test: manual

(cherry picked from commit c7161f756e86b98f2244a04d9207b47149965fd7)

Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
(cherry picked from commit dfcc79ee8e)
2016-11-11 01:21:35 +00:00
Narayan Kamath
330d0ebf48 Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am: 7bd25ab485 am: a045aed7a2 am: 846f64c6fc
am: 83b46a1590

Change-Id: Ib859c8848a05004a5de36aaf67b4dd3ac72899e9
2016-11-10 23:48:38 +00:00
Narayan Kamath
2f8ce5f5cb Zygote: Additional whitelisting for legacy devices. am: 7d302e018d am: f369b3ce75 am: e82866df3f
am: f8335b6a59

Change-Id: Iecd1ad8590d30eea4031eeeea3d455199221379c
2016-11-10 23:47:45 +00:00
Narayan Kamath
6ca924b884 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am: d60156dfc6 am: fd23b9d509 am: b0a7831375
am: 5594cfc2c3

Change-Id: I04a81810d474bedf7a8fcc4e089a95e1c7c030ba
2016-11-10 23:46:36 +00:00
Narayan Kamath
b7884e5a9f Zygote: Additional whitelists for runtime overlay / other static resources. am: 0ad0e859f6 am: 1e6a5d11a6 am: f0cd32619e -s ours
am: 4c26a969e9

Change-Id: I708b2d077eaad2c7bcf7d39a0d0449a5265779f1
2016-11-10 23:45:32 +00:00
neo.chae
fb74b8773a Fix idmap leak in zygote process am: 0244ca8d10 am: 82537abc3b am: 85afb42c16
am: b4b2203c5e

Change-Id: Ifd540b5f9cb1e32a002ed86c67eda30189f4e23f
2016-11-10 23:44:32 +00:00
Xin Li
ca2abc5b71 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

Change-Id: I5ee94abbb8f6f4e8f98e8b81349ba58da3601407
2016-11-10 23:43:39 +00:00
Xin Li
9788dd5bd2 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

Change-Id: I49e2be8c77a13c939fe5f7bf6c16e0e80fb3bbbb
2016-11-10 23:42:19 +00:00
Narayan Kamath
9958eb7180 Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev
am: 75c6b8c324

Change-Id: I4fb2f20ad4391915fe4ea734158274af5e879e10
2016-11-10 23:40:40 +00:00
Narayan Kamath
6bf96c1192 Zygote: Additional whitelisting for legacy devices.
am: 5e2f7c6229

Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a
2016-11-10 23:40:36 +00:00
Narayan Kamath
ba23956c45 Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
am: b3b03a9d78

Change-Id: Iafd7fc34df0fb88710003ea94219301d77ca78ed
2016-11-10 23:39:07 +00:00
Narayan Kamath
d501e032d8 Zygote: Additional whitelists for runtime overlay / other static resources.
am: 4e8ba1d73e

Change-Id: I52347c0024cc230d6e3db739eaafd78989c18430
2016-11-10 23:39:03 +00:00