Commit Graph

256895 Commits

Author SHA1 Message Date
Bill Yi
f2475c29e1 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I8fb493e8cd0005c0269c86209a48cd5e31179f81
2016-05-23 16:03:27 +00:00
Bill Yi
0b9b896202 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: Ibdb1ab97fd2995e507cec35a52a30063e91c5ff9
2016-05-23 16:03:23 +00:00
Bill Yi
90c743f621 Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours
am: ddf0507239  -s ours

* commit 'ddf050723952a4e83da26cae506f47e70dd50380':
  Import translations. DO NOT MERGE

Change-Id: Ib64bfe467ed10f2f513cbaf3b6f6cfd892d6230d
2016-05-23 16:03:19 +00:00
Bill Yi
a882b8c150 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 6a983faab3  -s ours

* commit '6a983faab35cc4f22611b0cb8041f4dcbac545dc':
  Import translations. DO NOT MERGE

Change-Id: If7150468a26a9a259b7696d2ee3594518ba0a213
2016-05-23 15:57:49 +00:00
Bill Yi
712c2cb2d2 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 7d1246e95d  -s ours

* commit '7d1246e95d0815424e6654af4ef613a7726551b1':
  Import translations. DO NOT MERGE

Change-Id: I320c2898acb42393e12e98e2b750bbc854f634d2
2016-05-23 15:57:47 +00:00
Bill Yi
1a49e73d2a Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 05be3b4541  -s ours

* commit '05be3b454134afc73ae44cda88af10bead5324a6':
  Import translations. DO NOT MERGE

Change-Id: I94238461acc288413140d20799142aba4dd7c353
2016-05-23 15:57:45 +00:00
TreeHugger Robot
6a983faab3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:49:55 +00:00
Android Build Merger (Role)
bb434299c7 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: fa65d11a21 -s ours" into nyc-mr1-dev 2016-05-23 15:49:37 +00:00
Bill Yi
ddf0507239 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fa65d11a21  -s ours

* commit 'fa65d11a21700634a52311190f40d5fd64535e8e':
  Import translations. DO NOT MERGE

Change-Id: I16981cd6000b92784f640ac979c373a60c59e839
2016-05-23 15:49:19 +00:00
Bill Yi
def7b43a66 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: bf97e34678  -s ours

* commit 'bf97e346786042f09220356346f964ba2f2f857b':
  Import translations. DO NOT MERGE

Change-Id: I8e1d043079e68b20c9de3d186916eca7938d4a71
2016-05-23 15:49:09 +00:00
Bill Yi
5d30133aa7 Merge "Import translations. DO NOT MERGE" into nyc-dev
am: fa65d11a21  -s ours

* commit 'fa65d11a21700634a52311190f40d5fd64535e8e':
  Import translations. DO NOT MERGE

Change-Id: Ia8ce2502ca409b0f462803f0e08b4f0d19c6faa2
2016-05-23 15:49:07 +00:00
TreeHugger Robot
18947ba2fa Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:48:46 +00:00
TreeHugger Robot
7b9f32be79 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:48:31 +00:00
TreeHugger Robot
7d1246e95d Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:15 +00:00
TreeHugger Robot
05be3b4541 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:48:00 +00:00
TreeHugger Robot
2e354740de Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:47:04 +00:00
TreeHugger Robot
fa65d11a21 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-05-23 15:35:53 +00:00
TreeHugger Robot
bf97e34678 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-05-23 15:35:13 +00:00
Lorenzo Colitti
11e13e2175 Support IPv6 multicast filtering in APF.
For now this just drops all non-ICMPv6 packets to ff00::/8 when
mMulticastFilter is true. Multicast ICMPv6 is already mostly
dealt with by other filters - the L2 multicast filter, the RA
filter, the multicast NA filter, and ND offload.

Bug: 28393601
Change-Id: Ia7b0d4f00fac6710093befe6a726b46677a5f20b
2016-05-24 00:02:07 +09:00
Erik Kline
d8e1592e64 Support DHCPv4 rebinding state
Bug: 24837343
Change-Id: Id49e1c12ec3b11fedba42bb28348a00cb0b11169
2016-05-23 23:56:46 +09:00
Ricky Wai
4266feeb93 Unlock work profile storage even work mode is off
Bug: 28860823
Change-Id: Ic89027f163e4c4e1ba9e8c24174475b6a4a983a4
2016-05-23 15:33:04 +01:00
Bill Yi
d5f7dc3e37 Import translations. DO NOT MERGE
Change-Id: Ib90b6a912d4d92b18051d73e63aada7ff036678e
Auto-generated-cl: translation import
2016-05-23 06:27:51 -07:00
Bill Yi
ea28bc9461 Import translations. DO NOT MERGE
Change-Id: I6a67ee6c7f1c034eaea3885f13884f6c7add477d
Auto-generated-cl: translation import
2016-05-23 06:21:44 -07:00
Android Build Merger (Role)
38f8eb343f Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp 2016-05-23 12:04:53 +00:00
Victor Chang
76ed5ce26c Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b
am: 8806a4bdc8

* commit '8806a4bdc8ce04fd658781498516983d2bef48dc':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I48e3e21e2fe84c64c0e90562202b3cc67b28601f
2016-05-23 12:03:43 +00:00
Victor Chang
8dda22449b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b
am: 1e93177121

* commit '1e93177121848f337c512b7ce0d06265abb02356':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: If568c19a9fb67eb847b776981a42049cececfe45
2016-05-23 12:03:40 +00:00
Victor Chang
8806a4bdc8 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I07d18fd5c472f1ab3f3ad4c37583e9092f4431b4
2016-05-23 11:59:02 +00:00
Victor Chang
1e93177121 Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev
am: d86ac8116b

* commit 'd86ac8116bfc64c61d8124ff8d3e92be5e55cd3e':
  New api in LockSettingsService to get StrongAuth synchronously

Change-Id: I3fe13c51d5d33f5689f0b4130a33cf3a2777e186
2016-05-23 11:58:41 +00:00
Victor Chang
d86ac8116b Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev 2016-05-23 11:51:56 +00:00
Sergio Giro
80755a5a25 ZygoteInit: install AndroidKeyStoreProvider in the Zygote
Instead of in activity thread. That way, we can warm up (ie,
precompute cached values) this provider and AndroidBCWorkaroundProvider
(which are installed together) so that the computation doesn't
happen in the app. As a result, the time spent in the first call to
SSLSocketFactory.getDefault() decreases by ~5ms in angler userdebug.
Measured with an app calling SSLSocketFactory.getDefault in onCreate
and timed it with System.currentTimeMillis() .

(cherry picked from commit 69de32071c)

Bug: 28545496
Change-Id: Ic4e11d058fb404eaa92db925a3e765fc3bef7ae2
2016-05-23 11:24:34 +01:00
Nicolas Prevot
051f3b7aec Use correct user id when checking uri grants for notification.
An application is allowed to notify a change to a uri if it
has a grant to this uri. Use the correct user id to check
this grant.

BUG:19312280
Change-Id: I8bad2e65325fdfef4907d7b71b4f264dff567217
2016-05-23 11:03:15 +01:00
Android Build Merger (Role)
d306fda1c7 Merge "Merge "Only actually log the DNS events we have." into nyc-dev am: cb98809657 am: d755f9b86b" into nyc-mr1-dev-plus-aosp 2016-05-23 09:15:06 +00:00
Lorenzo Colitti
4ffe811482 Merge "Only actually log the DNS events we have." into nyc-dev am: cb98809657
am: d755f9b86b

* commit 'd755f9b86b5c81c3c0607e78fd0cc2e08c44c304':
  Only actually log the DNS events we have.

Change-Id: I265934c939ed4e3f516f876ba4f0c4fe0f67ff55
2016-05-23 09:14:34 +00:00
Lorenzo Colitti
4a3f56861f Merge "Only actually log the DNS events we have." into nyc-dev am: cb98809657
am: 38aff6828d

* commit '38aff6828df4de050b4b9aca80511cfdfb19b939':
  Only actually log the DNS events we have.

Change-Id: Ia527a662758764b064b42e15c3e91a49eaded497
2016-05-23 09:13:53 +00:00
Lorenzo Colitti
38aff6828d Merge "Only actually log the DNS events we have." into nyc-dev
am: cb98809657

* commit 'cb988096570de8af4883ae3bdea06c88f8fd235a':
  Only actually log the DNS events we have.

Change-Id: I6fa83369e45fbf0a33c0519cc47e5d3f21321463
2016-05-23 09:10:55 +00:00
Lorenzo Colitti
d755f9b86b Merge "Only actually log the DNS events we have." into nyc-dev
am: cb98809657

* commit 'cb988096570de8af4883ae3bdea06c88f8fd235a':
  Only actually log the DNS events we have.

Change-Id: I97340d6b0483961d848e6f604a112636000675af
2016-05-23 09:10:52 +00:00
Bill Yi
62da4a0c6d Import translations. DO NOT MERGE
Change-Id: Iae2663ea18069432c84ffe5c4f01cf3cf8b1d7ff
Auto-generated-cl: translation import
2016-05-23 02:03:02 -07:00
TreeHugger Robot
cb98809657 Merge "Only actually log the DNS events we have." into nyc-dev 2016-05-23 09:01:45 +00:00
Bill Yi
88a2eff6cb Import translations. DO NOT MERGE
Change-Id: I23d94944484c50e6fae32f95b34406055078299e
Auto-generated-cl: translation import
2016-05-23 01:53:03 -07:00
Bill Yi
95750c3ac9 Import translations. DO NOT MERGE
Change-Id: I4bf63c7c9d2e24184607f05914e8e063e8792d45
Auto-generated-cl: translation import
2016-05-23 01:47:37 -07:00
Bill Yi
a5c77a4738 Import translations. DO NOT MERGE
Change-Id: I7c447305120cc398cbd0e7a98b8226ee7c632059
Auto-generated-cl: translation import
2016-05-23 01:42:41 -07:00
Bill Yi
ddbfd7a471 Import translations. DO NOT MERGE
Change-Id: Ic4303b94f9db348046f063592289d81b40bf88a9
Auto-generated-cl: translation import
2016-05-23 01:39:59 -07:00
Bill Yi
cdf7b067d0 Import translations. DO NOT MERGE
Change-Id: I22fbf5ac36b91251a267bbf1863ca1b1e914d032
Auto-generated-cl: translation import
2016-05-23 01:20:28 -07:00
Lorenzo Colitti
c304a15751 Only actually log the DNS events we have.
DnsEventListenerService#logAndClear was always logging 100 DNS
events regardless of how many were actually logged. The rest of
the events were either all zero or previously-recorded events.

Bug: 28204408
Change-Id: I9da3b07a2e7b7512397a3eb6568a877815eb3312
2016-05-23 16:39:18 +09:00
Android Build Merger (Role)
343301a624 Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp 2016-05-23 02:39:26 +00:00
Chad Brubaker
0c0fd01a61 Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: c6a49bb008

* commit 'c6a49bb008068eaa53ce308ffa4abaa2924c69ea':
  Use an attribute for the network security config resource

Change-Id: I10122107c51f3e986b362cc7e0307f73a8983b0b
2016-05-23 02:38:20 +00:00
Chad Brubaker
be04f7247a Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387
am: 76d3d8590d

* commit '76d3d8590d1fb9a9c341159fbc06914ef19bdb8d':
  Use an attribute for the network security config resource

Change-Id: I15da47a2cd78dc37019bd20847d13248612c77f5
2016-05-23 02:38:19 +00:00
Chad Brubaker
76d3d8590d Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I2236b69a2af2258e7600a4833fe7be95f64e6260
2016-05-23 02:32:19 +00:00
Chad Brubaker
c6a49bb008 Merge "Use an attribute for the network security config resource" into nyc-dev
am: 6812bdf387

* commit '6812bdf38797101d3744befe70f3501b75f01ce6':
  Use an attribute for the network security config resource

Change-Id: I470b8e991d590135223066d18b49ff123e0b1f6e
2016-05-23 02:32:19 +00:00
TreeHugger Robot
6812bdf387 Merge "Use an attribute for the network security config resource" into nyc-dev 2016-05-23 02:23:26 +00:00