Commit Graph

277484 Commits

Author SHA1 Message Date
Hugo Benichi
006e061301 Reject DHCP packets with no magic cookie
This patch adds an explicit check in the DHCP packet parser for
rejecting packets without a magic cookie, instead of relying on the
top-level try-catch-all in the parser.

This allows to add to DHCP error metrics this specific error.

It also allows to add two poor man's fuzzing tests that tries to find
additional gaps in the DHCP packet parser by
 - trying to parse all subslices of a valid offer packet.
 - trying to parse random byte arrays.

Test: covered by previously introduced malformed DHCP packet unit tests
      + additional fuzzing tests.
Bug: 31850211
Change-Id: If53c9ba9df78d7604ec018c9d67c237ae59c4833
2016-10-06 21:22:29 +09:00
Vladislav Kuzkokov
9f61d17e6a Revert "Fix backup for users hit by erroneous backup disabling"
BUG=31754835
This reverts commit 1975021d88.

Change-Id: I5cf7862126755a34cf3b4d70436529401fddc87f
2016-10-06 11:13:40 +00:00
Bill Yi
4049f7d326 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 6cffa2bf95  -s ours

Change-Id: I138bd5f7114a952632587b5c6089e153c9cd4ea2
2016-10-06 09:40:25 +00:00
Bill Yi
f2b0d92241 Import translations. DO NOT MERGE
am: ac7dd9a101  -s ours

Change-Id: Ibb296699e4f333586b7637ee7feb31da127e3c96
2016-10-06 09:40:20 +00:00
Bill Yi
ebe7e23af7 Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 84bf8e0122  -s ours

Change-Id: I60aeba1caa5fc32622472cf22f09c24d909fcf07
2016-10-06 09:38:54 +00:00
Bill Yi
dc4dc4f260 Import translations. DO NOT MERGE
am: a8afcaf508  -s ours

Change-Id: I2a609b8a5e1076798d68761d806486cf13f75391
2016-10-06 09:38:51 +00:00
TreeHugger Robot
6cffa2bf95 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-06 09:34:50 +00:00
TreeHugger Robot
84bf8e0122 Merge "Import translations. DO NOT MERGE" into cw-f-dev 2016-10-06 09:34:12 +00:00
TreeHugger Robot
5e6fb1699f Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-06 09:32:18 +00:00
TreeHugger Robot
f381889844 Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev 2016-10-06 09:31:26 +00:00
Neil Fuller
3649f7cb70 Merge "Remove .mk lines that are just setting the default" am: 8873c3821d am: 6a3c315b25
am: c611842e1c

Change-Id: Ib71490ac084c706b53ae83278f3f8fcd302fc0f2
2016-10-06 08:49:37 +00:00
Neil Fuller
c611842e1c Merge "Remove .mk lines that are just setting the default" am: 8873c3821d
am: 6a3c315b25

Change-Id: I24bd59700cd8b362691115e725cbf11e6accdedc
2016-10-06 08:43:42 +00:00
Neil Fuller
6a3c315b25 Merge "Remove .mk lines that are just setting the default"
am: 8873c3821d

Change-Id: Ic3a02567b2983da067cccc9ce38a2e29ef3834b6
2016-10-06 08:37:54 +00:00
Neil Fuller
8873c3821d Merge "Remove .mk lines that are just setting the default" 2016-10-06 08:31:34 +00:00
Bill Yi
41cf6c32a1 Import translations. DO NOT MERGE
Change-Id: Id0aff581c209fd43aa0daebbb1e7941652e1222c
Auto-generated-cl: translation import
2016-10-05 23:41:54 -07:00
Bill Yi
e6327db2af Import translations. DO NOT MERGE
Change-Id: Ica9bf5e820c6edad7236034a72b3e3f659727ac5
Auto-generated-cl: translation import
2016-10-05 23:28:53 -07:00
Etan Cohen
3b7703ee23 Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e am: b5d18a6b11
am: 84b7932077

Change-Id: I3b7366e623b8b97b57bd73fdd618033f79225a5e
2016-10-06 04:59:23 +00:00
Etan Cohen
84b7932077 Merge "[NAN] Expose NAN characteristics as an API" am: f12c6e4f5e
am: b5d18a6b11

Change-Id: I4614dc5659753ee1bfc6276090a5d1d7e9b209a0
2016-10-06 04:55:16 +00:00
Etan Cohen
b5d18a6b11 Merge "[NAN] Expose NAN characteristics as an API"
am: f12c6e4f5e

Change-Id: I842c7503eeb6d70c941e3097dae0207661cc906e
2016-10-06 04:51:12 +00:00
Etan Cohen
f12c6e4f5e Merge "[NAN] Expose NAN characteristics as an API" 2016-10-06 04:45:29 +00:00
Etan Cohen
e64c62fd02 [NAN] Expose NAN characteristics as an API
Expose NAN characteristics as an API.

(cherry-pick of commit 3a9de10963)

Bug: 31912101
Test: build and validate API updates
Change-Id: If02942d738aab8fa2f2f47489c6840af1bc38280
2016-10-05 20:00:53 -07:00
Etan Cohen
95fad688c3 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d am: c5101c52b6
am: 97b3d99577

Change-Id: Ie9eeeb5b5a898a8b147628d8aacf1e365fa6e91a
2016-10-06 02:21:04 +00:00
Etan Cohen
97b3d99577 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" am: ee1e81ec5d
am: c5101c52b6

Change-Id: Ib3d02752745845d4966965c98dac9d47e0551d6d
2016-10-06 02:16:08 +00:00
Etan Cohen
c5101c52b6 Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery"
am: ee1e81ec5d

Change-Id: I606be878116457c91d3c036a4a0086207a5a6752
2016-10-06 02:12:22 +00:00
Etan Cohen
ee1e81ec5d Merge "[NAN] Add COARSE_LOCATION permission check to NAN discovery" 2016-10-06 02:06:36 +00:00
Bill Yi
ac7dd9a101 Import translations. DO NOT MERGE
Change-Id: Ic724c8be4da50b16d7550e8c378262e50897ff67
Auto-generated-cl: translation import
2016-10-05 18:21:21 -07:00
Bill Yi
a8afcaf508 Import translations. DO NOT MERGE
Change-Id: I56b24b53ea2a6fce620699eacfcd152e4fd2558c
Auto-generated-cl: translation import
2016-10-05 18:13:10 -07:00
Andrii Kulian
781240d9bb Fix bounds rotation logic
Reuse code that computes window bounds for seamless rotation in
DisplayContent#rotateBounds. Also make sure that we operate with
display rect adjusted for the requested orientation.

Bug: 31005451
Bug: 29586417
Change-Id: Ie18ac2c84c7a3ea474e00e7108c3b3c21114e719
2016-10-05 17:20:50 -07:00
Hall Liu
4c01910cb0 Add logging to CallerInfoAsyncQuery
Add logging to CallerInfoAsyncQuery to help diagnose timeout errors

Bug: 31755827
Change-Id: If7cf34baf084ca8916952842585a32b3e93eba73
2016-10-05 16:56:17 -07:00
Nancy Zheng
e39a8a46d9 Change DEFAULT_BG_LOW_JOB_COUNT to 1 in JobSchedulerService.
Bug: 31601136
Change-Id: I595f192698b97dc6472a67dc1a1eebd60533efa7
2016-10-05 23:29:23 +00:00
Erik Wolsheimer
4d855f15ab Do not listen for clock ticks, time changes, timezone changes, or time format changes when TextClock is not visible
am: e12cd3bb3b

Change-Id: I4ce1dcc5184f8cf03904a19631b9efe4be1b47fa
2016-10-05 22:46:12 +00:00
Andreas Huber
152c5695bc Merge "Start hw-binder threadpool on HwBinder.getService() call." am: 5d49f802a4 am: 553866e9c3
am: d7dc327bc1

Change-Id: I2544d226f095865fd0ef5b8c2b39b94ca6bee5c1
2016-10-05 22:35:11 +00:00
Amanda Kassay
fd6846e116 Wear Preview, auto, tv, versions project metadata.
b/31771704 b/31903798 b/31773716

Staged:
https://android-dot-devsite.googleplex.com/about/versions/nougat/index.html
https://android-dot-devsite.googleplex.com/index.html
https://android-dot-devsite.googleplex.com/wear/preview/index.html

Change-Id: I639b3d168b839745669787c56b44c28fa85252d9
2016-10-05 22:31:46 +00:00
Andreas Huber
d7dc327bc1 Merge "Start hw-binder threadpool on HwBinder.getService() call." am: 5d49f802a4
am: 553866e9c3

Change-Id: I75b87c424c65f207fd75c8b809913d624546cbfb
2016-10-05 22:29:42 +00:00
Andreas Huber
553866e9c3 Merge "Start hw-binder threadpool on HwBinder.getService() call."
am: 5d49f802a4

Change-Id: I155ec0240f1ddce7b9128646378f18bfee153b86
2016-10-05 22:24:07 +00:00
Etan Cohen
2a4c81b7a7 [NAN] Add COARSE_LOCATION permission check to NAN discovery
NAN discovery can expose location based on service signatures.

(cherry-pick of commit e1d8a5a6fc)

Bug: 31907534
Test: unit test + integrated (sl4a) testing
Change-Id: Iec0fae507dfdae65fe08ab6e2ddb89334c15def5
2016-10-05 15:23:21 -07:00
Andreas Huber
5d49f802a4 Merge "Start hw-binder threadpool on HwBinder.getService() call." 2016-10-05 22:18:04 +00:00
Christopher Tate
652c5ad516 Fix job scheduler crash due to uninstall race
It's possible to get a PACKAGE_CHANGED broadcast well after the
package has actually been uninstalled outright because of broadcast
delivery latencies.  Understand the exception that might be thrown
when asking for package info in such cases, so we don't crash the
Android runtime.

Bug 31865735

Change-Id: I69b2678f0f724fc731aa48fed7af58ce60d3c21c
2016-10-05 14:45:46 -07:00
Tenghui Zhu
8e93abcd6c Merge "Make umbra lighter when the blocker is too high and has no real umbra area." into nyc-mr1-dev 2016-10-05 21:34:17 +00:00
Robert Carr
d7dbec7e4c When adding dialog window but not creating update the configuration.
When we dismiss the dialog as opposed to hide it, it is removed
from the local WindowManagerGlobal's list of ViewRoots. Thus it stops
receiving configuration changes. When first adding a ViewRoot it will
pull the configuration from the context, but in this case
we are reusing one which has already been added and removed
and no such action will occur.

Bug: 31004614
Change-Id: Ie247bcf1a14caf4a42413c6813e337aa4c88e3e4
2016-10-05 13:44:36 -07:00
Winson Chung
e8ebe11209 Merge "Revert "Bump up preloading recents on boot up to user unlocked."" into nyc-mr1-dev 2016-10-05 19:52:58 +00:00
TreeHugger Robot
b9bb518632 Merge "Ambient: Re-register all trigger sensors if one fires" into nyc-mr1-dev 2016-10-05 19:51:06 +00:00
Erik Wolsheimer
e12cd3bb3b Do not listen for clock ticks, time changes, timezone changes, or time format changes when TextClock is not visible
BUG: 31840153
Change-Id: I11adf1036fb25b28aee5caba6daa1ab0d9d1f23a
2016-10-05 12:45:37 -07:00
Winson Chung
501d59dcea Revert "Bump up preloading recents on boot up to user unlocked."
This reverts commit c3eedd972d.

Bug: 31823698

Change-Id: I575c64ff19463e84ebdb2950a798a371de4cfa13
2016-10-05 19:44:35 +00:00
Dirk Dougherty
6e80977fab Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am: 794e0d3578
am: 6c2137eb9a

Change-Id: I06c6dc62bacc150896097b17f3423d3dd0e43093
2016-10-05 18:53:18 +00:00
Dirk Dougherty
5d6be1abca Merge "Doc change: remove intl/nn from collections paths." into nyc-dev am: 794e0d3578
am: fc7475c5b3

Change-Id: Id3e3b71ed89d2b46cf7f7c0df1e69a1b8c986000
2016-10-05 18:53:14 +00:00
Dirk Dougherty
bd0ffa01b3 Doc change: remove intl/nn from collections paths. am: 240ddd735c
am: a679c2f9ea

Change-Id: I0b5911aed265b2f8c8a21609d7624f19f9913ef2
2016-10-05 18:52:25 +00:00
Dirk Dougherty
7ceecc61ec Doc change: remove intl/nn from collections paths. am: 240ddd735c
am: 016f01ebfe

Change-Id: I069f07c183489c07d7010b8bb0fd85ac36216671
2016-10-05 18:52:23 +00:00
Dirk Dougherty
fc7475c5b3 Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
am: 794e0d3578

Change-Id: Iba00fba1609011852b4b80b589859421a0933ca2
2016-10-05 18:47:52 +00:00
Dirk Dougherty
016f01ebfe Doc change: remove intl/nn from collections paths.
am: 240ddd735c

Change-Id: I9a8a5643b68675353f7a1b10453cddd51fcebcf8
2016-10-05 18:47:48 +00:00