OSDN Git Service
Narayan Kamath [Mon, 14 Nov 2016 13:07:49 +0000 (13:07 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7 am:
8e6e5a157b
am:
65abe1066d
Change-Id: Id11cf7f2b1dbf1db6eb047f1e2015689d733ab69
Narayan Kamath [Mon, 14 Nov 2016 12:57:59 +0000 (12:57 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e am:
d17867203b
am:
59e6dccb4c
Change-Id: I210a7f36c6bef41c62a12c0b84e3b054f7aebf99
Hugo Benichi [Mon, 14 Nov 2016 12:56:47 +0000 (12:56 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae am:
afa3694ea9
am:
37cacc77ce
Change-Id: I7c5bc81af38a6b6a3ea26f64ae5c1773a91f1bf6
Hugo Benichi [Mon, 14 Nov 2016 12:55:35 +0000 (12:55 +0000)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
am:
476da32d86 -s ours
Change-Id: Ic4ff5e0c392488315659bef421535d43ac115e6f
Narayan Kamath [Mon, 14 Nov 2016 12:51:41 +0000 (12:51 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45 am:
a20eebfab7
am:
8e6e5a157b
Change-Id: Ie00c71b1bef751c2f0b039a5a150fc6971fbf415
Narayan Kamath [Mon, 14 Nov 2016 12:50:15 +0000 (12:50 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8 am:
932cd0ed0e
am:
d17867203b
Change-Id: I2d230bcbb539def3db3da59e45e0c1e86ff13a2b
Hugo Benichi [Mon, 14 Nov 2016 12:49:00 +0000 (12:49 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206 am:
e40917b1ae
am:
afa3694ea9
Change-Id: I7ac1eb75c3bde52332875e992124407e6cfd5417
Hugo Benichi [Fri, 11 Nov 2016 02:24:23 +0000 (11:24 +0900)]
DO NOT MERGE resolve merge conflicts of
b446883 to nyc-dev
Change-Id: I854eddda678934d0da083d22b99b855ed57fd644
Narayan Kamath [Fri, 11 Nov 2016 00:09:32 +0000 (00:09 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into mnc-dev am:
b3b03a9d78 am:
ba23956c45
am:
a20eebfab7
Change-Id: I8a6859c90c2ce2f0ba532fd43b214d759889ae25
Narayan Kamath [Fri, 11 Nov 2016 00:04:27 +0000 (00:04 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources. am:
4e8ba1d73e am:
d501e032d8
am:
932cd0ed0e
Change-Id: Iadfa4ef7ca1537df9c9a0d53bb75dce0f64be567
Hugo Benichi [Fri, 11 Nov 2016 00:03:26 +0000 (00:03 +0000)]
Merge "DhcpClient: guard against failure to parse packets" into mnc-dev am:
fce4e43167 am:
3d9a2d7206
am:
e40917b1ae
Change-Id: I69225098ff2d75aa1a3f5245c0703c06282c7441
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
Hugo Benichi [Thu, 10 Nov 2016 23:55:50 +0000 (23:55 +0000)]
resolve merge conflicts of
89aa6fb to mnc-dr-dev am:
a0cfb157ec
am:
0e013c9b9f
Change-Id: Iab130296a52ba31005344793ed07c22003ac729f
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: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 18:25:11 +0000 (18:25 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours am:
0e11e0d961 -s ours
am:
69246f0565 -s ours
Change-Id: I8181f07829ea7e77986a0f4537a61e4060c1176e
Hugo Benichi [Thu, 10 Nov 2016 18:23:58 +0000 (18:23 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours am:
da695f5fdb -s ours
am:
69d565b12d -s ours
Change-Id: Ibe074076d22a736394a01d27aa9e1c7ed73458b2
Chris Elliott [Thu, 10 Nov 2016 18:12:17 +0000 (18:12 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev am:
06a55fb553 -s ours
am:
0e11e0d961 -s ours
Change-Id: I800746b8b1fc8e63eb78a83632d9eaac9abebcd2
Hugo Benichi [Thu, 10 Nov 2016 18:11:02 +0000 (18:11 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission am:
f88508bd3e -s ours
am:
da695f5fdb -s ours
Change-Id: If1903ace2a31d8ccf3c66916211a07ac342fc360
Chris Elliott [Thu, 10 Nov 2016 18:04:28 +0000 (18:04 +0000)]
Merge "DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into cw-e-dev
am:
06a55fb553 -s ours
Change-Id: I3e0facc6ff6dff0109452fe36f89a4eefe7676e1
Hugo Benichi [Thu, 10 Nov 2016 18:04:26 +0000 (18:04 +0000)]
DO NOT MERGE ANYWHERE Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission
am:
f88508bd3e -s ours
Change-Id: I2ba3b591df623298f41e92e6f0d067a6fcf30533
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 10:15:59 +0000 (10:15 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
am:
a67112ca92
Change-Id: Ib8bef283e74694a415dc73f2c16b4de3b201798e
Narayan Kamath [Thu, 10 Nov 2016 10:15:56 +0000 (10:15 +0000)]
Zygote : Block SIGCHLD during fork.
am:
dfcc79ee8e
Change-Id: I64b380e54d73c777898ece33ba62b838b556921b
Narayan Kamath [Thu, 10 Nov 2016 10:04:09 +0000 (10:04 +0000)]
Merge "Zygote : Block SIGCHLD during fork." into nyc-dev
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
Xin Li [Wed, 9 Nov 2016 20:45:40 +0000 (20:45 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058 am:
503661118a -s ours
am:
4146229e69
Change-Id: I5530c638ccd5ad8af4115e6d8c5f85351948811d
Xin Li [Wed, 9 Nov 2016 20:44:35 +0000 (20:44 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2 am:
84a9614947 -s ours
am:
d167a27c1f
Change-Id: I6301865f95712e610ab75031fe401386a8010efd
Xin Li [Wed, 9 Nov 2016 20:36:11 +0000 (20:36 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e am:
71e62a4058
am:
503661118a -s ours
Change-Id: I1dc24f01552359d8cdaea875f399878fa55ea2e0
Xin Li [Wed, 9 Nov 2016 20:34:42 +0000 (20:34 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba am:
63c9a312a2
am:
84a9614947 -s ours
Change-Id: I0a1887ae82111b39e1dea53fadea452bc522c2ae
Xin Li [Wed, 9 Nov 2016 20:24:23 +0000 (20:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev." into mnc-dev am:
cc115c5931 am:
eda0b0078e
am:
71e62a4058
Change-Id: I0d66e9689c9ec4a2537cdd23a73ec4dbb74cfd1a
Xin Li [Wed, 9 Nov 2016 20:23:01 +0000 (20:23 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into marshmallow-dev" into mnc-dev. am:
ee2903686f -s ours am:
6166af96ba
am:
63c9a312a2
Change-Id: I5123223d1ba04f94d52261ab77d6ec33a0c7dc75
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
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:13:19 +0000 (20:13 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-dev
am:
12f98789bf
Change-Id: Ib86b20a2e51cac443adc73d5c18bca73ac316613
Narayan Kamath [Wed, 9 Nov 2016 20:13:16 +0000 (20:13 +0000)]
Zygote: Additional whitelists for runtime overlay / other static resources.
am:
25cd01cc69
Change-Id: I64dce88921b36a58dc66cd4b89e571ce9b8114eb
Xin Li [Wed, 9 Nov 2016 20:11:43 +0000 (20:11 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
am:
49b144e630
Change-Id: Ib96a27383309fee13040dae1e12c23802a17f19f
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:38 +0000 (20:11 +0000)]
Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev.
am:
9b9906e9c0 -s ours
Change-Id: I3456ce6db555dfed284003579ef24d70ae99d13c
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 [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
Narayan Kamath [Wed, 9 Nov 2016 09:48:38 +0000 (09:48 +0000)]
Merge "Zygote: Additional whitelists for runtime overlay / other static resources." into nyc-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
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:55 +0000 (21:24 +0000)]
Merge "Merge "Merge "DO NOT MERGE - Added Emergency affordance feature" into nougat-dev" into nyc-dev." into nyc-dev
Jeff Sharkey [Tue, 8 Nov 2016 00:33:50 +0000 (00:33 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995 am:
09e10e54f8
am:
a61e5fb9f6
Change-Id: I3716aa9bfc3816e9a0159560daf755fcf89904f1
Jeff Sharkey [Tue, 8 Nov 2016 00:32:05 +0000 (00:32 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390 am:
babd7e06d3
am:
8554f2d934
Change-Id: I81c9598e3434fe44f1324a4115a9eda39047070d
Jeff Sharkey [Tue, 8 Nov 2016 00:29:22 +0000 (00:29 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c am:
8e803f734a
am:
874a7af9f7
Change-Id: Ia13bf45bfb0ac5057a2a8899b0bd543c238d7d3e
Jeff Sharkey [Tue, 8 Nov 2016 00:25:31 +0000 (00:25 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433 am:
84ef9e69fc
am:
e4419f474e
Change-Id: Ic7ac4b928536fb5d7b18957d35e2ca1aea832fed
Jeff Sharkey [Tue, 8 Nov 2016 00:17:51 +0000 (00:17 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61 am:
0a23c1a995
am:
09e10e54f8
Change-Id: I1bb3bc5f0db563797262a8e4485f4ede25db4c99
Jeff Sharkey [Tue, 8 Nov 2016 00:16:13 +0000 (00:16 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc am:
dc89fb9390
am:
babd7e06d3
Change-Id: Ib810882924443e195b31d505f8d1657914c6edfe
Jeff Sharkey [Tue, 8 Nov 2016 00:13:51 +0000 (00:13 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab am:
7738ebcd5c
am:
8e803f734a
Change-Id: I80f21d5df3b37c27a9c56c1412ae942b88264349
Jeff Sharkey [Tue, 8 Nov 2016 00:10:32 +0000 (00:10 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731 am:
59bb608433
am:
84ef9e69fc
Change-Id: Icf8d31fa28b1223d3f789ff653bbecfbcf87bcfb
Jeff Sharkey [Tue, 8 Nov 2016 00:09:41 +0000 (00:09 +0000)]
Public volumes belong to a single user. am:
def2123f56 -s ours
am:
de221f06a3
Change-Id: I73f0c785931688020dcdc5bd16f54449f0bf6f51
Jeff Sharkey [Tue, 8 Nov 2016 00:04:28 +0000 (00:04 +0000)]
Merge "Public volumes belong to a single user." into mnc-dr-dev am:
b232177c61
am:
0a23c1a995
Change-Id: Ib501fa0ed255de6ac64aae58ad12eaec4889d46e
Jeff Sharkey [Tue, 8 Nov 2016 00:03:04 +0000 (00:03 +0000)]
Public volumes belong to a single user. am:
6b0079d3bc
am:
dc89fb9390
Change-Id: I2b4587edb6ae1a7c4c0eb4532a7af36143c20da5
Jeff Sharkey [Tue, 8 Nov 2016 00:01:30 +0000 (00:01 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev am:
34849c22e7 am:
60acc3e6ab
am:
7738ebcd5c
Change-Id: Ib812b973ddb26098f10bd88a7ec19573bdf900c0
Jeff Sharkey [Mon, 7 Nov 2016 23:59:45 +0000 (23:59 +0000)]
Public volumes belong to a single user.
am:
def2123f56 -s ours
Change-Id: I2e71df725f742ab1e29f9b0f7f89285f659f8a35
Jeff Sharkey [Mon, 7 Nov 2016 23:59:38 +0000 (23:59 +0000)]
Public volumes belong to a single user. am:
3a062a67fa am:
e80720a731
am:
59bb608433
Change-Id: I6cdf548573e909e11239e9a7a2f4190750a79758
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:43:18 +0000 (23:43 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
am:
d537f76b88
Change-Id: I6d76d35678d3a1cbbab3fe0290540fa5fe3c80ad
Jeff Sharkey [Mon, 7 Nov 2016 23:43:14 +0000 (23:43 +0000)]
Public volumes belong to a single user.
am:
6566fbe99b
Change-Id: If636376b98c449aee3794259317e39a3f0f7f163
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:29:39 +0000 (23:29 +0000)]
Merge "Public volumes belong to a single user." into nyc-dev
Jeff Sharkey [Mon, 7 Nov 2016 23:27:52 +0000 (23:27 +0000)]
Merge "Public volumes belong to a single user." into mnc-dev
Hemal Patel [Mon, 7 Nov 2016 22:11:06 +0000 (22:11 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
am:
80956c99b1
Change-Id: I9a030b5080f7c1abe9a9e00404a7b72979e27aec
Hemal Patel [Mon, 7 Nov 2016 22:10:59 +0000 (22:10 +0000)]
Docs: Revised the Drawable example
am:
ad302b60f4
Change-Id: I3504dde2e7a31a50c59e3be239ae0160f84435ef
Hemal Patel [Mon, 7 Nov 2016 21:57:46 +0000 (21:57 +0000)]
Merge "Docs: Revised the Drawable example" into nyc-dev
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
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
Hemal Patel [Tue, 4 Oct 2016 01:27:18 +0000 (18:27 -0700)]
Docs: Revised the Drawable example
Revised the Drawable example with VectorDrawable-friendly example
Bug:
18009084
Change-Id: Ia6d0ad46a352601c7032244b17d28b9dd690de1d
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
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 [Wed, 2 Nov 2016 15:51:17 +0000 (15:51 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours am:
eb3696542a -s ours
am:
41bdd3a668 -s ours
Change-Id: I70baae78d036713c95c02e9cad497a343d5d1309
Thomas Buhot [Wed, 2 Nov 2016 15:50:38 +0000 (15:50 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours am:
7b43f2af93 -s ours
am:
40d2aa1edc -s ours
Change-Id: I741b9682b066384aadce0dcaf9ca792de015d59e
Shuo Gao [Wed, 2 Nov 2016 15:46:36 +0000 (15:46 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages am:
1b5d5bd119 -s ours
am:
eb3696542a -s ours
Change-Id: I9a78875432e05918c574c9d8ea89230067b811cc
Thomas Buhot [Wed, 2 Nov 2016 15:45:43 +0000 (15:45 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous am:
80e6d8873b -s ours
am:
7b43f2af93 -s ours
Change-Id: Ia6804a8b93168a033075b6e77ac5d1bec63e3d69
Shuo Gao [Wed, 2 Nov 2016 15:41:06 +0000 (15:41 +0000)]
DO NOT MERGE ANYWHERE Enable shader cache for applications that shared UID with multiple packages
am:
1b5d5bd119 -s ours
Change-Id: I6c218970581361c195471ee435f5a91b109911f0
Thomas Buhot [Wed, 2 Nov 2016 15:40:34 +0000 (15:40 +0000)]
DO NOT MERGE ANYWHERE libhwui: make setSurface asynchronous
am:
80e6d8873b -s ours
Change-Id: I521a8a64510e89ee97578fc5e2f600b4a1851bd3
Jeff Sharkey [Mon, 31 Oct 2016 20:33:49 +0000 (14:33 -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>
Cheryl Potter [Tue, 25 Oct 2016 15:03:23 +0000 (15:03 +0000)]
docs: change gpu debugger redirect b/
31781348
am:
afbf16f908
Change-Id: I6fa42074ba2fe6019f0bf817a7b21650d2a0dd43
Cheryl Potter [Tue, 25 Oct 2016 04:29:23 +0000 (21:29 -0700)]
docs: change gpu debugger redirect
b/
31781348
Change-Id: I7e374dcec975ba45b03f1cde656a438f986c5093
George French [Tue, 25 Oct 2016 00:19:33 +0000 (00:19 +0000)]
docs: Update startService() & bindService() documentation (Proj13)
am:
9748d76be9
Change-Id: I976128eb4c14ee2587c9cfa9c34f4b3dc006aa38
George French [Wed, 7 Sep 2016 16:59:32 +0000 (09:59 -0700)]
docs: Update startService() & bindService() documentation (Proj13)
Updated Update startService() and bindService() docs to mention that they
no longer support implicit intent. And mentioned that the Intellegent
job scheduling is now the preferred method for launching services.
We also performed a copy edit, implementing Google styles.
Bug:
18333456
Change-Id: I2b2ec666be870aea15045d30fbc822256d1b9a81
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
Dan Yu [Wed, 19 Oct 2016 17:52:35 +0000 (17:52 +0000)]
Merge "docs: Updating TIF docs for new TIF Companion library." into nyc-docs am:
dc69de5ac6
am:
3aa0ff2de7
Change-Id: If9e2b5d23f40a5d48906b81f818a2e9b5e8bb24a