OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 00:56:26 +0000 (00:56 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
fbf395c220
Change-Id: I453445723ea9f6124d876dc32c6defab42432351
Jeff Sharkey [Wed, 30 Nov 2016 23:07:00 +0000 (16:07 -0700)]
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
23ec811266fb728cf159a90ce4882b3c9bac1887)
Andriy Naborskyy [Sat, 12 Nov 2016 03:18:51 +0000 (03:18 +0000)]
Merge "DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"" into cw-e-dev
Brian Carlstrom [Fri, 11 Nov 2016 04:11:38 +0000 (04:11 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev
am:
5d0cabf78e
Change-Id: I7df6aac34bab92746b226b622db56c7f9d1d8cef
Narayan Kamath [Fri, 11 Nov 2016 04:11:35 +0000 (04:11 +0000)]
Zygote : Block SIGCHLD during fork.
am:
b6f3751599
Change-Id: I1bc21b7ede2151803313cb3c827b051d4decf795
Brian Carlstrom [Fri, 11 Nov 2016 04:02:58 +0000 (04:02 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into mnc-dr-dev
Narayan Kamath [Fri, 11 Nov 2016 02:03:00 +0000 (02:03 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79 am:
50b0c3be57 -s ours
am:
e1e735bcb9
Change-Id: I07af6efeed14cabe3aa7d41b2a9eaad2ccff62c6
Narayan Kamath [Fri, 11 Nov 2016 01:56:28 +0000 (01:56 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338 am:
14bd75fa79
am:
50b0c3be57 -s ours
Change-Id: I745d1c8e0066b0a7864d931b268b04a9458c7984
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
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
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. 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
dfcc79ee8ecd4166cba19be7493c6175cb0c65a9)
Narayan Kamath [Fri, 11 Nov 2016 00:07:12 +0000 (00:07 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc am:
83b46a1590
am:
330d0ebf48
Change-Id: I0205706d025ea0609c22fec008ea1c954a618f63
Narayan Kamath [Fri, 11 Nov 2016 00:06:09 +0000 (00:06 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f am:
f8335b6a59
am:
2f8ce5f5cb
Change-Id: Icad715644a83a7d37ab49be465d7761f4f22c9af
Narayan Kamath [Fri, 11 Nov 2016 00:05:13 +0000 (00:05 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375 am:
5594cfc2c3
am:
6ca924b884
Change-Id: Ia63b73c73eb5d8b1a98e95807e1a5fa0280cdeb7
Narayan Kamath [Fri, 11 Nov 2016 00:04:09 +0000 (00:04 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours am:
4c26a969e9
am:
b7884e5a9f
Change-Id: Ice56c0d81f57757cb9e238cd20c5d968142b8bdd
neo.chae [Fri, 11 Nov 2016 00:02:56 +0000 (00:02 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16 am:
b4b2203c5e
am:
fb74b8773a
Change-Id: I4a2630b7217462897070029a613489c7909aedf6
Xin Li [Fri, 11 Nov 2016 00:01:56 +0000 (00:01 +0000)]
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
Change-Id: Ia45feea279ef24afe3450108fc63343461abf7ea
Xin Li [Fri, 11 Nov 2016 00:00:49 +0000 (00:00 +0000)]
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
Change-Id: I317b0be7182896e39fd23b152ff08ebf4de37592
Narayan Kamath [Thu, 10 Nov 2016 23:59:49 +0000 (23:59 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev am:
75c6b8c324
am:
9958eb7180
Change-Id: I1fd9dd6f8326ab7077c62fccde6dc508a971db3e
Narayan Kamath [Thu, 10 Nov 2016 23:58:54 +0000 (23:58 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
5e2f7c6229
am:
6bf96c1192
Change-Id: I65bc57fa4fe9fa1257ce0f4b5836616594643234
Narayan Kamath [Thu, 10 Nov 2016 23:57:55 +0000 (23:57 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78
am:
ba23956c45
Change-Id: I0b1c263050e6c15f1d6915bd86b14f257c92e9eb
Narayan Kamath [Thu, 10 Nov 2016 23:56:58 +0000 (23:56 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e
am:
d501e032d8
Change-Id: I97c4e04554c2da5bee56dc741cf71c7d2f1cba60
Hugo Benichi [Thu, 10 Nov 2016 23:55:53 +0000 (23:55 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167
am:
3d9a2d7206
Change-Id: I00250433819d7b04a101f747da100c0d13a0adcb
Narayan Kamath [Thu, 10 Nov 2016 23:48:38 +0000 (23:48 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2 am:
846f64c6fc
am:
83b46a1590
Change-Id: Ib859c8848a05004a5de36aaf67b4dd3ac72899e9
Narayan Kamath [Thu, 10 Nov 2016 23:47:45 +0000 (23:47 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75 am:
e82866df3f
am:
f8335b6a59
Change-Id: Iecd1ad8590d30eea4031eeeea3d455199221379c
Hugo Benichi [Thu, 10 Nov 2016 23:46:53 +0000 (23:46 +0000)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev
am:
a0cfb157ec
Change-Id: I10ee0e4e8ef8a1785a16f6f83b8bb38b8847e85a
Narayan Kamath [Thu, 10 Nov 2016 23:46:36 +0000 (23:46 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509 am:
b0a7831375
am:
5594cfc2c3
Change-Id: I04a81810d474bedf7a8fcc4e089a95e1c7c030ba
Narayan Kamath [Thu, 10 Nov 2016 23:45:32 +0000 (23:45 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6 am:
f0cd32619e -s ours
am:
4c26a969e9
Change-Id: I708b2d077eaad2c7bcf7d39a0d0449a5265779f1
neo.chae [Thu, 10 Nov 2016 23:44:32 +0000 (23:44 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b am:
85afb42c16
am:
b4b2203c5e
Change-Id: Ifd540b5f9cb1e32a002ed86c67eda30189f4e23f
Xin Li [Thu, 10 Nov 2016 23:43:39 +0000 (23:43 +0000)]
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
Xin Li [Thu, 10 Nov 2016 23:42:19 +0000 (23:42 +0000)]
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
Narayan Kamath [Thu, 10 Nov 2016 23:40:40 +0000 (23:40 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev
am:
75c6b8c324
Change-Id: I4fb2f20ad4391915fe4ea734158274af5e879e10
Narayan Kamath [Thu, 10 Nov 2016 23:40:36 +0000 (23:40 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
5e2f7c6229
Change-Id: I36adcd8393eab2bb4421f9e3e72302c5db37422a
Narayan Kamath [Thu, 10 Nov 2016 23:39:07 +0000 (23:39 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
am:
b3b03a9d78
Change-Id: Iafd7fc34df0fb88710003ea94219301d77ca78ed
Narayan Kamath [Thu, 10 Nov 2016 23:39:03 +0000 (23:39 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
4e8ba1d73e
Change-Id: I52347c0024cc230d6e3db739eaafd78989c18430
Hugo Benichi [Thu, 10 Nov 2016 23:37:51 +0000 (23:37 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev
am:
fce4e43167
Change-Id: I9bf79e439213358381668b8c15d2d3061fa1170d
Chris Elliott [Thu, 10 Nov 2016 17:48:19 +0000 (17:48 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
Narayan Kamath [Thu, 10 Nov 2016 11:17:48 +0000 (11:17 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a am:
35b8453338
am:
14bd75fa79
Change-Id: I9b2acc6d40cc0f4724598f97b704c040bba15417
Narayan Kamath [Thu, 10 Nov 2016 11:12:11 +0000 (11:12 +0000)]
Zygote : Block SIGCHLD during fork. am:
b1f1209d9a
am:
35b8453338
Change-Id: I7c73b1a37d79f31ad8fff6d0b83426debbfd88f9
Narayan Kamath [Thu, 10 Nov 2016 11:05:42 +0000 (11:05 +0000)]
Zygote : Block SIGCHLD during fork.
am:
b1f1209d9a
Change-Id: I3658f583c82dd6243089aaa74ad731a5bfa85b01
Narayan Kamath [Mon, 7 Nov 2016 16:22:48 +0000 (16:22 +0000)]
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
e9a525829a354c92983a35455ccab16d1b0d3892)
Zygote: Unblock SIGCHLD in the parent after fork.
Follow up to change
e9a525829a354c92983a. 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
1480dc3e97b661f5bfa3a5c2fbce72385b8d2be6)
Change-Id: If89903a29c84dfc9b056f9e19618046874bba689
Andriy Naborskyy [Thu, 10 Nov 2016 01:51:24 +0000 (01:51 +0000)]
DO NOT MERGE ANYWHERE Revert "DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous"
This reverts commit
80e6d8873b79ced40e79fcba0bf793ea6528d20c.
Bug:
32771832
Change-Id: Ia2f2ffd08dfd87cbce1ec750d6b61277799b536f
Hugo Benichi [Tue, 19 Jul 2016 06:59:27 +0000 (15:59 +0900)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
This patch creates a new permission used by ConnectivityService to give
access to restricted networks without the NET_CAPABILITY_NOT_RESTRICTED
capability bit on.
Bug:
24497316
Change-Id: I5b6c8a9ef14395b2f1ab26cb17b24d7876ec79f1
Hugo Benichi [Thu, 10 Nov 2016 01:31:31 +0000 (10:31 +0900)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev
Change-Id: I9e4e538081600be6a8199060bcb0d4040c071a22
Narayan Kamath [Wed, 9 Nov 2016 20:31:32 +0000 (20:31 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485 am:
a045aed7a2
am:
846f64c6fc
Change-Id: Id2d5000722d160df14dd33aa937a36388b971b76
Narayan Kamath [Wed, 9 Nov 2016 20:30:33 +0000 (20:30 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d am:
f369b3ce75
am:
e82866df3f
Change-Id: Icb4fcfc35784e5fbe913f8efb810879fd3011154
Narayan Kamath [Wed, 9 Nov 2016 20:29:37 +0000 (20:29 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6 am:
fd23b9d509
am:
b0a7831375
Change-Id: Ifb6032bd3c392ad90236b2ecaa18fa53894c4620
Narayan Kamath [Wed, 9 Nov 2016 20:28:35 +0000 (20:28 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6 am:
1e6a5d11a6
am:
f0cd32619e -s ours
Change-Id: I1b1a0428d1cc49ee4096f5459a5aa1a1f62ed700
neo.chae [Wed, 9 Nov 2016 20:25:12 +0000 (20:25 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10 am:
82537abc3b
am:
85afb42c16
Change-Id: Ibb5ac24b2149637bf19b9a16153b1fcde5dbb45f
Xin Li [Wed, 9 Nov 2016 20:24:12 +0000 (20:24 +0000)]
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
Change-Id: Ifbc0ae4b514592e5e731b555bd4d393e46ad136d
Xin Li [Wed, 9 Nov 2016 20:23:04 +0000 (20:23 +0000)]
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
Change-Id: I25ba4f5731ecaed22faa95e3948e389405dca7e7
Xin Li [Wed, 9 Nov 2016 20:17:53 +0000 (20:17 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931
am:
eda0b0078e
Change-Id: Ibf745e727c36dd04b5cb30b574cca4b5709b9f4b
Narayan Kamath [Wed, 9 Nov 2016 20:17:01 +0000 (20:17 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev am:
7bd25ab485
am:
a045aed7a2
Change-Id: Iec015c0607286511a0d82db7fd6c82f6e17379aa
Xin Li [Wed, 9 Nov 2016 20:17:00 +0000 (20:17 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours
am:
6166af96ba
Change-Id: I591eb39cc8f7e3528a35ae1d98f641fdf12c4082
Narayan Kamath [Wed, 9 Nov 2016 20:16:06 +0000 (20:16 +0000)]
Zygote: Additional whitelisting for legacy devices. am:
7d302e018d
am:
f369b3ce75
Change-Id: Id0794434479585b2cf4b4996256a3cb9374fd9a7
Narayan Kamath [Wed, 9 Nov 2016 20:15:05 +0000 (20:15 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev am:
d60156dfc6
am:
fd23b9d509
Change-Id: I86ad3b0fe5c3da67014540c1aa35c4326ee4f33b
Narayan Kamath [Wed, 9 Nov 2016 20:14:07 +0000 (20:14 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
0ad0e859f6
am:
1e6a5d11a6
Change-Id: Ia98abb9cb437dd3c42b80de5c0cd98c965e6603e
neo.chae [Wed, 9 Nov 2016 20:13:07 +0000 (20:13 +0000)]
Fix idmap leak in zygote process am:
0244ca8d10
am:
82537abc3b
Change-Id: I83d338ebfdefd0f935c4cfb14c3b15efca1cce0f
Xin Li [Wed, 9 Nov 2016 20:11:44 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev
am:
78f15948fb
Change-Id: I5f5509cd98a6a98ce9edc782e9d8ef9093fa86e4
Xin Li [Wed, 9 Nov 2016 20:11:42 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
am:
cc115c5931
Change-Id: I9e226ffdca4c3633061f0202da367e2be0eeeb1f
Xin Li [Wed, 9 Nov 2016 20:11:40 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev.
am:
7e0483fcec -s ours
Change-Id: I3a351771548f827aeecf9a4c8305b907c106abc5
Xin Li [Wed, 9 Nov 2016 20:11:37 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev.
am:
ee2903686f -s ours
Change-Id: I565953c9962f328055512615185de735c33a50bb
Narayan Kamath [Wed, 9 Nov 2016 11:26:09 +0000 (11:26 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into mnc-dev
Narayan Kamath [Wed, 9 Nov 2016 10:24:57 +0000 (10:24 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
am:
7bd25ab485
Change-Id: I0266e2fe129ac5ae0c7bbd84e7890d5c41872655
Narayan Kamath [Wed, 9 Nov 2016 10:24:53 +0000 (10:24 +0000)]
Zygote: Additional whitelisting for legacy devices.
am:
7d302e018d
Change-Id: I15f8e0ec93f502ca45a9b00d93baa66780701996
Narayan Kamath [Wed, 9 Nov 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Zygote: Additional whitelisting for legacy devices." into lmp-dev
Narayan Kamath [Wed, 9 Nov 2016 09:45:32 +0000 (09:45 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev
Narayan Kamath [Wed, 9 Nov 2016 09:39:23 +0000 (09:39 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev
am:
d60156dfc6
Change-Id: I3696ed3639492ae446ccd1c9ad4feaaa9e15a5ef
Narayan Kamath [Wed, 9 Nov 2016 09:39:20 +0000 (09:39 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
0ad0e859f6
Change-Id: Id24798deebb738ba6c6b6abef28ca96c0c61dc79
Narayan Kamath [Wed, 9 Nov 2016 09:30:47 +0000 (09:30 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into lmp-dev
neo.chae [Wed, 9 Nov 2016 09:21:46 +0000 (09:21 +0000)]
Fix idmap leak in zygote process
am:
0244ca8d10
Change-Id: Ia35ded23161ad5c5c6fe4dea388e74b8d8af2955
Hugo Benichi [Wed, 9 Nov 2016 02:24:41 +0000 (02:24 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev
Xin Li [Tue, 8 Nov 2016 21:25:38 +0000 (21:25 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev
Xin Li [Tue, 8 Nov 2016 21:24:12 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into lollipop-mr1-dev" into lmp-mr1-dev." into lmp-mr1-dev
neo.chae [Mon, 31 Oct 2016 15:02:38 +0000 (00:02 +0900)]
Fix idmap leak in zygote process
Fix a idmap leak in AssetManager::addSystemOverlays.
And, The fix could also prevent fd leak of idmap.
Test: none
Bug:
32691930
Signed-off-by: Hyangseok Chae <neo.chae@lge.com>
(cherry picked from commit
6a742a38509693f8b39ee9a5ad2803fca12688bf)
Change-Id: Idc4af77db2b0cb739bd6b009b6af0f9123be1aac
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.
Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.
Bug:
32691930
Test: manual
(cherry picked from commit
5e2f7c6229d7191183888d685b57a7d0a2835fce)
Change-Id: I9700fc7b469d0bc4d876c52292f25888b94a5223
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
Jeff Sharkey [Mon, 7 Nov 2016 23:54:41 +0000 (23:54 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev
am:
b232177c61
Change-Id: I0188c9744af905133ad36ab45705828d5286b804
Jeff Sharkey [Mon, 7 Nov 2016 23:54:35 +0000 (23:54 +0000)]
Public volumes belong to a single user.
am:
6b0079d3bc
Change-Id: Ibcd6221eaa3e15dddd0682c21eae2460cdf1683f
Jeff Sharkey [Mon, 7 Nov 2016 23:48:57 +0000 (23:48 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7
am:
60acc3e6ab
Change-Id: I105a361b58b19c1102bef2c88a0ad5f281c793c6
Jeff Sharkey [Mon, 7 Nov 2016 23:46:19 +0000 (23:46 +0000)]
Public volumes belong to a single user. am:
3a062a67fa
am:
e80720a731
Change-Id: I2ccf22ad13ff106b1ee3c750258917dee6c6f631
Jeff Sharkey [Mon, 7 Nov 2016 23:43:23 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:35:40 +0000 (23:35 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
am:
34849c22e7
Change-Id: I5c57bb60ad565b4382184dbe55fc0e61d2fc3f0f
Jeff Sharkey [Mon, 7 Nov 2016 23:35:34 +0000 (23:35 +0000)]
Public volumes belong to a single user.
am:
3a062a67fa
Change-Id: Ibe40a7985bde6ff6d8bc307c28b94f7b1445c961
Jeff Sharkey [Mon, 7 Nov 2016 23:27:52 +0000 (23:27 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
Narayan Kamath [Mon, 7 Nov 2016 19:59:29 +0000 (19:59 +0000)]
Zygote: Additional whitelisting for legacy devices.
On M and below, we provide a blanket whitelist for all files under
"/vendor/zygote_whitelist". This path is whitelisted purely to allow
this patch to be applied easily on legacy devices and configurations.
Note that this does not amount to a loosening of our security policy
because whitelisted files are reopened anyway.
Bug:
32691930
Test: manual
Change-Id: If5b53f6f0a707f8d36603c09bfd3f72dbfbbbb99
Narayan Kamath [Fri, 23 Sep 2016 08:07:11 +0000 (09:07 +0100)]
Zygote: Additional whitelists for runtime overlay / other static resources.
Partially cherry picked from commit
1c15c635785c64a.
These files are safe to reopen for the same reason that files in
/system/framework are. They're regular files and will not change after
the first zygote fork.
Bug:
32618130
Change-Id: I119e0bfcbf397cb331064adf148d92a5cd3ea92f
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Jeff Sharkey [Wed, 2 Nov 2016 21:26:01 +0000 (15:26 -0600)]
Public volumes belong to a single user.
When a public (vfat) device is inserted, it's strongly associated
with the current foreground user, and no other users should be able
to access it, since otherwise that would be a cross-user data leak.
To use the device under a different user, switch users and then
eject/remount the device.
Test: verified user isolation of USB drive
Bug:
32523490
Change-Id: I590c791996f1fea8d78f625dc942d149f1f41614
Shuo Gao [Tue, 1 Mar 2016 05:32:03 +0000 (13:32 +0800)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
from AOSP: https://android-review.googlesource.com/#/c/209490/
Frameworks supported a mature mechanism for shader cache per each package already,
but as a special case such as Settings APP, if there are several packages in this
application which means that multiple packages shared the same SharedUserID with it,
it won't initialize the graphics disk caches, thereby APP like Settings have to
rebuild and relink shader every time during launch, which cause a bad launching
performance, so here to enable the GFX and RS cache initialization for multiple
shared packages case too.
Change-Id: If0f927e3399b775804abf1d9a868887951f471c5
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Thomas Buhot [Fri, 4 Dec 2015 11:18:03 +0000 (12:18 +0100)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
from AOSP: https://android-review.googlesource.com/#/c/183305/
On the critical path of the cold launch of applications
the main thread of the started application tells the RenderThread
to create a surface. This process is synchronous and blocks
the main thread of the application until the creation
of the EGLContext is complete.
As a consequence the launch time of the application is delayed
by time spent allocating the EGL Context in the RenderThread.
With this optimization the launch time of any application
is improved (for example settings by 20 to 40 ms).
Change-Id: Ibf47aaa0abb8dedf7aa00693073db3785d9d6b08
Signed-off-by: Thomas Buhot <thomas.buhot@intel.com>
Signed-off-by: Zhiquan Liu <zhiquan.liu@intel.com>
Hugo Benichi [Tue, 11 Oct 2016 02:39:39 +0000 (11:39 +0900)]
DhcpClient: guard against failure to parse packets
DhcpPacket.decodeFullPacket() is not exception safe and can throw
various runtime exceptions when trying to parse malicious or malformed
packets.
This patch adds a generic catch-all-exception in DhcpClient to avoid
propagating the exception and killing the framework process on reception
of such malformed packets.
Bug:
31850211
Change-Id: I2e723a792ff067ada2834da875700d4df16c5159
Sungsoo [Tue, 18 Oct 2016 18:13:55 +0000 (18:13 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours am:
8c94179f51
am:
336791758a
Change-Id: I7aba59c53b9fbeb6d58d139d730cdb13af78d6bb
Sungsoo [Tue, 18 Oct 2016 18:07:19 +0000 (18:07 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42 am:
583a7017ce -s ours
am:
8c94179f51
Change-Id: I8abecc3855c2dd92fbf25717bd56481dd1ee37ea
Sungsoo [Tue, 18 Oct 2016 18:00:54 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours am:
ec44540d42
am:
583a7017ce -s ours
Change-Id: I39976fd7bf943dd9b4e38c084270c977cf0511ca
Sungsoo [Tue, 18 Oct 2016 18:00:45 +0000 (18:00 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours am:
9cf942973d
am:
25cbc1b7ec
Change-Id: Ie8e3cfffd550c15b8d43d59539962d07934e76a3
Sungsoo [Tue, 18 Oct 2016 17:54:57 +0000 (17:54 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours am:
21c4e6d532 -s ours
am:
ec44540d42
Change-Id: Id4fd3422c443d5e7363d3ff27b2ba0eeb532f1dd
Sungsoo [Tue, 18 Oct 2016 17:47:59 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
ad74e88f1d am:
41b775b40a -s ours am:
8be090868e
am:
69febedd6d
Change-Id: Id1c70a1131d860d027fed915088918232899f026
Sungsoo [Tue, 18 Oct 2016 17:47:58 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e am:
9a15881184 -s ours
am:
21c4e6d532 -s ours
Change-Id: Ibf02e62ee13accd5d204c44faeb6aa8c05afb709
Sungsoo [Tue, 18 Oct 2016 17:47:56 +0000 (17:47 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8 am:
8e2451759d -s ours
am:
9cf942973d
Change-Id: Ice1c96b49f7350a41cf35779f0f1fb06f6ff0c77
Sungsoo [Tue, 18 Oct 2016 17:41:55 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
418e0869ba am:
a5affb045e
am:
9a15881184 -s ours
Change-Id: I67ba2d8b8d3c3f32fca417303ee422482acc40d8
Sungsoo [Tue, 18 Oct 2016 17:41:49 +0000 (17:41 +0000)]
DO NOT MERGE) ExifInterface: Close the file when an exception happens am:
135524f2c5 -s ours am:
02cd808ab8
am:
8e2451759d -s ours
Change-Id: Id0d69d1bddcf0d6059b53bd3a4b2b55df493899c