Dirk Dougherty
6c2137eb9a
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
...
am: 794e0d3578
2016-10-05 18:47:28 +00:00
Dirk Dougherty
a679c2f9ea
Doc change: remove intl/nn from collections paths.
...
am: 240ddd735c
2016-10-05 18:47:23 +00:00
Dirk Dougherty
794e0d3578
Merge "Doc change: remove intl/nn from collections paths." into nyc-dev
2016-10-05 18:40:50 +00:00
Andreas Huber
781c083f32
Start hw-binder threadpool on HwBinder.getService() call.
...
Bug: 31961648
Test: hidl_test_java
Change-Id: I6caf778ab78a875427a17e1758ab724836c8d34e
2016-10-05 11:10:26 -07:00
Jordan Liu
f2456cb127
Add key to CarrierConfigManager
...
Add KEY_DEFAULT_VM_NUMBER_STRING and default value. Note that default
vm number no longer needs to be a string array, as gid is handled
within the new carrier_configs. Also remove references to old config.
Merged-In: I56e4e3713c27f449fd892db501b6097c8c89c3c6
Bug: 29873049
Change-Id: I56e4e3713c27f449fd892db501b6097c8c89c3c6
2016-10-05 11:02:38 -07:00
Sid Soundararajan
a4a4763f58
Recents TV: Do not allow negative delay
...
In rare cases, the getChildCount() has a delayed update. It enters the
for loop, and then changes to return 0. This can potentially allow
a negative delay, causing a crash.
BUG: 31933255
Change-Id: Ia245edc9fca0e1712c2af5c301bac632caed1568
2016-10-05 10:30:32 -07:00
Dirk Dougherty
6761a449fa
Merge "Update preview-community redirect to point at +AD." into nyc-dev am: 61d3faa52c
...
am: 874c69cef5
2016-10-05 17:12:07 +00:00
Dirk Dougherty
58f3833580
Update preview-community redirect to point at +AD. am: 559013e711
...
am: 285c017c6f
2016-10-05 17:11:13 +00:00
Dirk Dougherty
7f5f8b1df8
Merge "Update preview-community redirect to point at +AD." into nyc-dev am: 61d3faa52c
...
am: 8f8fe7df92
2016-10-05 17:08:33 +00:00
Dirk Dougherty
ddd2e0442e
Update preview-community redirect to point at +AD. am: 559013e711
...
am: 1241838fb4
2016-10-05 17:07:44 +00:00
Dirk Dougherty
874c69cef5
Merge "Update preview-community redirect to point at +AD." into nyc-dev
...
am: 61d3faa52c
2016-10-05 17:02:27 +00:00
Dirk Dougherty
8f8fe7df92
Merge "Update preview-community redirect to point at +AD." into nyc-dev
...
am: 61d3faa52c
2016-10-05 17:02:25 +00:00
Dirk Dougherty
285c017c6f
Update preview-community redirect to point at +AD.
...
am: 559013e711
2016-10-05 17:02:23 +00:00
Dirk Dougherty
1241838fb4
Update preview-community redirect to point at +AD.
...
am: 559013e711
2016-10-05 17:02:21 +00:00
Dirk Dougherty
61d3faa52c
Merge "Update preview-community redirect to point at +AD." into nyc-dev
2016-10-05 16:52:39 +00:00
Dirk Dougherty
240ddd735c
Doc change: remove intl/nn from collections paths.
...
Change-Id: I45c0322d39a54e2565401d11bdc56d7e8e555cd2
Bug-Id: 31940660
2016-10-05 16:49:43 +00:00
Mark Salyzyn
834763b2ab
jni: move security interfaces to private
...
Test: Compile & boot smoke
Bug: 19235719
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I09328bda5d58138ad222f082bdd3688a97df5b35
2016-10-05 08:04:46 -07:00
Edward Savage-Jones
b08a146617
Make PIN/password failed attempts dialog non-cancelable
...
This commit makes it harder for a users pocket to trigger an MDM
remote wipe, by setting the warning dialog to noncancelable.
With this change the pocket would first need to tap on OK before
being able to attempt to enter a PIN. This mirrors the existing
behaviour of both PIN and PUK warning dialogs.
Test: manual - enable an MDM set to trigger a wipe of the device/user
on unsucessful unlock attempts. Then incorrectly enter your PIN until
the warning dialog appears. The dialog should only be dismissable
by pressing the 'OK' button.
Change-Id: I4d86af555a5d8b226ceffa4711bd5e277db93f1e
2016-10-05 16:55:24 +02:00
Hugo Benichi
e0ea7fecd6
Catch runtime exceptions when parsing DHCP packets
...
This patch adds a try catch all to DHCP packet parsing so that
DhcpClient does not choke on malformed packets, brinding down with it
the whole framework.
Test: added new unit tests catching the issue fixed in this patch.
Bug: 31850211
Change-Id: I3c50a149fed6b2cbc4f40bb4f0e5bb2b56859b44
2016-10-05 21:58:26 +09:00
Neil Fuller
b04b5f697d
Remove .mk lines that are just setting the default
...
1.8 is now the default unless targeting an old SDK.
Bug: 31944681
Test: make checkbuild
Change-Id: Ic8a50cfd332da8b84eb87207a3c2d2c9a9a58e99
2016-10-05 13:38:36 +01:00
Jakub Adámek
3bec1fe176
Merge "Improving customization in DeviceDefault themes." into cw-f-dev
...
am: a87ba31b70
2016-10-05 08:02:20 +00:00
Jakub Adamek
c05369968b
Improving customization in DeviceDefault themes.
...
am: 426e7a0f83
2016-10-05 08:02:15 +00:00
Jakub Adámek
a87ba31b70
Merge "Improving customization in DeviceDefault themes." into cw-f-dev
2016-10-05 07:57:24 +00:00
Etan Cohen
3a6a9a441f
Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1 am: 6619d5b545
...
am: f633e57b26
2016-10-05 05:32:59 +00:00
Etan Cohen
f633e57b26
Merge "[NAN] Use NAN capability information to validate configurations" am: 141a2840e1
...
am: 6619d5b545
2016-10-05 05:29:00 +00:00
Etan Cohen
6619d5b545
Merge "[NAN] Use NAN capability information to validate configurations"
...
am: 141a2840e1
2016-10-05 05:24:47 +00:00
Etan Cohen
141a2840e1
Merge "[NAN] Use NAN capability information to validate configurations"
2016-10-05 05:20:05 +00:00
Andreas Gampe
7779734d82
Merge "Debug: Initialize local to false" am: 33d404efb0 am: 3327b49429
...
am: 0bcb437677
2016-10-05 04:52:00 +00:00
Andreas Gampe
0bcb437677
Merge "Debug: Initialize local to false" am: 33d404efb0
...
am: 3327b49429
2016-10-05 04:47:34 +00:00
Andreas Gampe
3327b49429
Merge "Debug: Initialize local to false"
...
am: 33d404efb0
2016-10-05 04:42:56 +00:00
Treehugger Robot
33d404efb0
Merge "Debug: Initialize local to false"
2016-10-05 04:34:57 +00:00
TreeHugger Robot
534a17e96c
Merge "Fix issue #31305336 : File corrupt: too many wake locks 101" into nyc-mr1-dev
2016-10-05 03:54:13 +00:00
TreeHugger Robot
30a0f96250
Merge "Allow shell to acquire wakelock. DO NOT MERGE." into nyc-mr1-dev
2016-10-05 03:49:27 +00:00
Dan Aminzade
118d1dec31
Merge "Automatically grant location and body sensors permissions to system packages that handle the com.android.fitness.TRACK intent." into cw-f-dev
...
am: 90e57bc278
2016-10-05 03:13:01 +00:00
Dan Aminzade
3629c67395
Automatically grant location and body sensors permissions to system packages that handle the com.android.fitness.TRACK intent.
...
am: f8d60b19ce
2016-10-05 03:12:54 +00:00
Dan Aminzade
90e57bc278
Merge "Automatically grant location and body sensors permissions to system packages that handle the com.android.fitness.TRACK intent." into cw-f-dev
2016-10-05 03:10:02 +00:00
Andreas Gampe
ce71149cc3
Debug: Initialize local to false
...
Ensure that a later read always sees a well-defined value.
Bug: 31943543
Test: m
Change-Id: I654f7896bf1c07a67911196f8906007955f00b85
2016-10-04 19:35:50 -07:00
Etan Cohen
99997dc1ab
[NAN] Use NAN capability information to validate configurations
...
Validate publish and subscribe configurations and message length using
the NAN configuration retrieved from the firmware.
(cherry-pick of commit 65eaa6d821
2016-10-04 18:37:19 -07:00
Teng-Hui Zhu
9c555566bf
Make umbra lighter when the blocker is too high and has no real umbra area.
...
b/31939390
Test: CTS testShadowLayout && Manual FrameworkShadow test
Change-Id: Ib0b6c4239ac8a521a827be246e912daf2ad3b885
2016-10-04 17:26:09 -07:00
Christopher Tate
eafb535072
Eliminate unnecessary object churn in job scheduler updating
...
The arbitrary-caller "what job is currently running?" state inspector
returns a clone of the JobStatus record for it, not a live reference
to the scheduler's active state. That's appropriate for most cases
but when doing its own internal bookkeeping, the object churn in cloning
(especially, an unneeded clone just for purposes of comparing to some
other job!) is merely a huge waste of CPU and GC load.
So now we don't do that unnecessarily, and everything is much leaner.
Bug 31751985
Change-Id: Idacb52e9e5ca17b9e12b7ccd2fc2e1ec8b3547f6
2016-10-04 16:42:52 -07:00
Adrian Roos
0288dcc825
Ambient: Re-register all trigger sensors if one fires
...
Works around an issue where triggering one trigger sensor can
affect other trigger sensors. To be sure, re-register them all.
Change-Id: I4a0999275638e8a78c3c604fda6527aff0d9365a
Fixes: 31933894
2016-10-04 19:23:26 -04:00
Paul Stewart
7d25ab7b11
Merge "Tethering: check if configManager is null" into nyc-mr1-dev
2016-10-04 23:17:13 +00:00
Rebecca Silberstein
b07f140904
Tethering: check if configManager is null
...
Before attempting to retrieve a carrier entitlement setting, first make
sure we have a carrier config manager and if we do have a carrier config
manager, the config it holds is not null.
Bug: 31929638
Change-Id: Iee476c476cb3de109cdccbd955b7fb986dd4267b
2016-10-04 14:28:05 -07:00
Rob Carr
c65dc5529e
Merge changes I99f18930,I5f6830d8 into nyc-mr1-dev
...
* changes:
Prevent any rotation while seamless rotation is pending.
Prevent triggering orientation changes until previous completes.
2016-10-04 20:58:44 +00:00
Jason Monk
3523728e77
Merge "QS: Don't set flashlight state when we don't have an id" into nyc-mr1-dev
2016-10-04 20:33:16 +00:00
Lei Yu
3fd73a645a
Merge "Add "FILTER_NOT_HIDE" to filter out the apps." into nyc-mr1-dev
2016-10-04 19:51:24 +00:00
Jason Monk
ad32c550c0
QS: Don't set flashlight state when we don't have an id
...
Also add a dump to FlashlightController for better visibility.
Change-Id: I7e826c58598ccc18e211aaab31a2e4d039234fc1
Fixes: 31352536
2016-10-04 14:50:11 -04:00
Bill Yi
5df3738aed
Merge "Import translations. DO NOT MERGE" into cw-f-dev
...
am: 8217bdab27
2016-10-04 18:48:01 +00:00
Bill Yi
67e8b7b5f0
Import translations. DO NOT MERGE
...
am: f39d5807a6
2016-10-04 18:47:57 +00:00
Bill Yi
e03f970ab4
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-04 18:47:02 +00:00
