Commit Graph

266851 Commits

Author SHA1 Message Date
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
8429444f8e Merge "Import translations. DO NOT MERGE" 2016-05-23 15:54:24 +00:00
TreeHugger Robot
2152dfc757 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:54:04 +00:00
TreeHugger Robot
1a2d348feb Merge "Import translations. DO NOT MERGE" 2016-05-23 15:53:57 +00:00
TreeHugger Robot
7b48a39aa3 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:53:27 +00:00
TreeHugger Robot
ccbf2ccfb1 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:53:21 +00:00
TreeHugger Robot
1a3f56f3dc Merge "Import translations. DO NOT MERGE" 2016-05-23 15:53:05 +00:00
TreeHugger Robot
272d208965 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:52:31 +00:00
TreeHugger Robot
40e0cfc88e Merge "Import translations. DO NOT MERGE" 2016-05-23 15:51: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
a6867ee458 Merge "Import translations. DO NOT MERGE" 2016-05-23 15:37:55 +00:00
TreeHugger Robot
58bb6bf51f Merge "Import translations. DO NOT MERGE" 2016-05-23 15:37:35 +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
Simon Baldwin
ba816e0c9e Refactor ZygoteInit to support a WebView-specific zygote.
This is a non-functional change that separates out functionality
that should be shared between the system zygote and the WebView
zygote from that which is system zygote specific.

* Move MethodAndArgsCaller to Zygote.
* Split out server socket functions into ZygoteServer.
* Add a new (stub, for now) WebViewZygoteInit class.

Bug: 22084679
Bug: 21643067
Change-Id: I4c508a42af7ab7b53d10570ad53b846df7782cc4
2016-05-23 15:26:25 +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
Bill Yi
c1008fb475 Import translations. DO NOT MERGE
Change-Id: I7dc8f792230a042990272067d70ed46bcbe90ac7
Auto-generated-cl: translation import
2016-05-23 05:28:34 -07:00
Bill Yi
c8789b558d Import translations. DO NOT MERGE
Change-Id: I430fe7fa4e4a3021620f9a7b3d7dc7b3fcd2e61b
Auto-generated-cl: translation import
2016-05-23 05:23:11 -07:00
Victor Chang
d9e0315858 Merge "Merge "New api in LockSettingsService to get StrongAuth synchronously" into nyc-dev am: d86ac8116b am: 8806a4bdc8" into nyc-mr1-dev-plus-aosp
am: 38f8eb343f

* commit '38f8eb343f1055f552d437560353aa3701bea764':

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

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

Change-Id: Ibb8312c7e8b5920ecd4790882ba63c132b913a47
2016-05-23 12:09:32 +00: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
Lorenzo Colitti
5de0bce1a3 Merge "Merge "Only actually log the DNS events we have." into nyc-dev am: cb98809657 am: d755f9b86b" into nyc-mr1-dev-plus-aosp
am: d306fda1c7

* commit 'd306fda1c7513768bb80ffb234ee4d03a9fdcfc8':

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

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

Change-Id: I70034399ed11ebbc9d1a8e2716d7326c8813265d
2016-05-23 09:19:33 +00: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