237704 Commits

Author SHA1 Message Date
Alan Viverette
29e2d427a4 Merge "Make Material switch style public" into nyc-dev 2016-04-05 14:51:04 +00:00
Oleksiy Vyalov
b68bcbdfe7 Send nativeDebuggable byte value as part of HELLO response.
Bug: 27942453

Change-Id: I4a222c88e104040b08e603e300e54a1ca2c038fe
2016-04-05 07:25:18 -07:00
Bill Yi
5798a425ec Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:22:21 +00:00
Bill Yi
06296dbb87 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:21:52 +00:00
Bill Yi
22092d7794 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:49 +00:00
Bill Yi
ba6880ec51 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:16:18 +00:00
Bill Yi
8a9cc710f2 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:15:41 +00:00
Alan Viverette
16aaa3e535 Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev 2016-04-05 14:15:10 +00:00
Bill Yi
a0480cc36b Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 14:14:57 +00:00
Alan Viverette
9e902f86ac Make Material switch style public
Bug: 28001482
Change-Id: I0dcbf585db13d2efffd09ec0e329170114f372a1
2016-04-05 10:14:27 -04:00
Jason Monk
b65b7105cd Revert "Add Preference#onDetachedFromActivity"
This reverts commit e18dc50c63110a57cfc29ec9bd21bf3f59abb6b4.
Fixes: 27807793

Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit eff3ca5480789c51768a3a1697503fbbdadc1bd6)
2016-04-05 14:06:47 +00:00
Robin Lee
691b1a6005 Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev 2016-04-05 14:04:40 +00:00
Jason Monk
723a65a51b Merge "Fix Build" into nyc-dev 2016-04-05 13:49:41 +00:00
Jason Monk
7c359bf6df Fix Build
Previous revert didn't catch test-current.txt

Change-Id: I82575361bcc4f3c7e05dbec4cbe5201b03717bcb
2016-04-05 09:47:40 -04:00
Bill Yi
1a548b2a89 Import translations. DO NOT MERGE
Change-Id: Ibc7139b72a805e48a1906368d25df01e55f68b9b
Auto-generated-cl: translation import
2016-04-05 06:44:13 -07:00
Bill Yi
1f61b4b976 Import translations. DO NOT MERGE
Change-Id: Iacf5ebcf0264fa13b097db13948f9b880f8e19c2
Auto-generated-cl: translation import
2016-04-05 06:37:59 -07:00
Lorenzo Colitti
19e84f7b75 Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
* changes:
  Clean up netd state when tethering fails.
  Clear LinkProperties on interface removed.
2016-04-05 13:35:09 +00:00
Lorenzo Colitti
c42c97540f Clean up netd state when tethering fails.
If we do not call untether, NetworkController will still think
that wlan0 is part of the LOCAL network, and thus any attempt to
use wlan0 for anything else is doomed to fail.

Bug: 27917299
Change-Id: Ibb63f6b477b85b92281d9667adf8af148deb266c
2016-04-05 20:28:57 +09:00
Lorenzo Colitti
a3d5948c37 Clear LinkProperties on interface removed.
When an interface is removed, all netlink events for that
interface are lost, because netd will no longer be able to
resolve the ifindex in the netlink event to an interface name,
and it only communicates to the framework events that include an
interface name.

This can cause us to end up with stale IP addresses if, for
example, wlan0 is removed because we switch wifi back from AP
mode to STA mode when exiting tethering. The presence of stale
IPv4 addresses can in turn lead us to miss a provisioning
notification because we already think we have an IPv4 address.

Change-Id: Ib64559a5a4fa261f483760b69fa7996314e7cc17
2016-04-05 20:28:57 +09:00
Keisuke Kuroyanagi
a46be16612 Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev 2016-04-05 09:24:08 +00:00
Diego Perez
4ce88b10ab Merge "Separate inflate from render step" into nyc-dev 2016-04-05 08:17:46 +00:00
Keisuke Kuroyanagi
a1a56ed09c Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev 2016-04-05 07:50:47 +00:00
Bill Yi
9e59dfad9a Import translations. DO NOT MERGE
Change-Id: I127b5c781f20c942712801cf9b044d7b27403b07
Auto-generated-cl: translation import
2016-04-05 00:32:16 -07:00
Keisuke Kuroyanagi
b1b8865017 Fix: Selection handle behavior in scrolled TextView.
When dragging a selection handle, it moves to strange position in
scrolled TextView because scroll position isn't took into account.
This issue was introduced by rebase mistaking in
I2a7e87ad08416f4bd01a5f6.

Bug: 28008281
Change-Id: I6217483fcc0b9a7e661f02a1f276114ddd5031a4
2016-04-05 16:26:16 +09:00
Bill Yi
f65a843661 Import translations. DO NOT MERGE
Change-Id: Ib8200b22451664277e49d59489e1727b281fa960
Auto-generated-cl: translation import
2016-04-05 00:18:26 -07:00
Bill Yi
0b3aebbe03 Import translations. DO NOT MERGE
Change-Id: I313e43e4b0f2f90265415bfb36ac3316dcb58e00
Auto-generated-cl: translation import
2016-04-05 00:12:38 -07:00
Bill Yi
f1ac762db1 Import translations. DO NOT MERGE
Change-Id: I2ee1e4554a52b1932121c963a8dd99a19e8bc990
Auto-generated-cl: translation import
2016-04-05 00:08:13 -07:00
Andrii Kulian
d900337da8 Fix override insets when dragging divider in split-screen
Previously, if frame extended beyond screen, override inset was set
to zero for corresponding dimension. This caused issues while dragging
down in vertical split-screen because navigation bar inset was not
included.
This CL sets override inset value as a difference between corresponding
content area dimension and screen dimension.

Bug: 27970692
Change-Id: I5bd16077a7deb039516bc9e11aa58315f809455a
2016-04-05 00:02:26 -07:00
Jorim Jaggi
f15a7351a0 Fix wrong inset bounds
When passing tempTaskBounds != null but tempInsetBounds == null,
we ended up using the stack bounds to calculate the insets, which
is really wrong. First fallback onto tempTaskBounds, and then the
stack bounds.

Bug: 27887505
Change-Id: I66ee0da1415a67af824f4c63b56644d590728813
2016-04-04 23:54:30 -07:00
Aga Wronska
2209860597 Merge "Hide 'select all' menu option when ALLOW_MULTIPLE intent is not passed in DocumentsActivity. Make 'select all' select only enabled files." into nyc-dev 2016-04-05 04:34:09 +00:00
Pavel Zhamaitsiak
f8565cd3f3 Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev 2016-04-05 04:29:12 +00:00
Sudheer Shanka
7c92133134 Remove the admin from the removing list when refreshing that admin.
Change-Id: I9b597a116db4f1fb894427b4e885f29c3e94abdb
Fixes: 27909181
2016-04-04 21:05:54 -07:00
Erik Kline
a91307b240 Delete unused DnsPinger
Change-Id: I1912603f2dabf70bcad19a055651e33e9247bd31
2016-04-05 13:05:52 +09:00
Erik Kline
39ca5c2280 Merge "Delete unused default DNS setting code" into nyc-dev 2016-04-05 04:00:28 +00:00
Erik Kline
5db3f10e9a Merge "Move from on464XlatChange() to setNeighborDiscoveryOffload()" into nyc-dev 2016-04-05 03:55:42 +00:00
Bill Yi
f7d28faa04 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-05 03:22:27 +00:00
Erik Kline
3609013c86 Delete unused default DNS setting code
Change-Id: I601a647714171f205d179d6fef6c112949fc5a94
2016-04-05 11:48:01 +09:00
Alex Klyubin
40ccfdd831 Permit package downgrades on debuggable platforms.
This is to make it easier to test on debuggable builds. Debuggable
platform builds trade off being as close as possible in behavior to
non-debuggable builds and being more testable/debuggable. Thus,
debuggable platform builds make no security guarantees and it is thus
acceptable to disable this security mechanism on debuggable platform
builds to help with development/testing/QA.

Bug: 27327503
Change-Id: I19340b95f08c57ff2aba59a08babb6a941c93c3a
2016-04-04 19:46:47 -07:00
Lorenzo Colitti
cd404a2fc3 Merge "Add APF code to drop ARP IPv4 requests not for us" into nyc-dev 2016-04-05 02:46:39 +00:00
Erik Kline
5c2e9224a7 Move from on464XlatChange() to setNeighborDiscoveryOffload()
Bug: 26238390
Change-Id: I0f971fbf04e44cb61017653f944d71e1f6d128b4
2016-04-05 11:39:14 +09:00
Adam Lesinski
a149c42071 Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev 2016-04-05 02:22:52 +00:00
Sergei Vasilinetc
5169c62c6c Merge "Fix opacity setup in FrameBuilder" into nyc-dev 2016-04-05 01:54:47 +00:00
Paul Jensen
a8458c0363 Add APF code to drop ARP IPv4 requests not for us
The WiFi chipset's ARP offload may handle this when the
AP is asleep, but when the AP is awake and the chipset is in
wake-on-wifi mode use APF to filter these packets.

Bug: 27477163
Change-Id: I180c08bd7301a1af9c3f728ff3cba06ca4e1022d
2016-04-05 01:42:34 +00:00
Phil Weaver
72fde85f7f Remove unusable a11y APIs for ClickableSpans.
This change essentially backs out ag/683646, which added an API to click
on ClickableSpans within a TextView. This API has the flaw, however,
that ClickableSpans are not parcelable, so they are not in general
reported to AccessibilityServices. That means that services will have no
idea what they are activating.

Since the API is not usable end-to-end, I'm backing it out before the
API is final.

Bug: 17726921
Change-Id: I541c6218f2899ff67a6b32a13fd9ae6f3b53b3c4
2016-04-04 18:37:32 -07:00
Ashutosh Joshi
b4cc448946 Merge "App upload to Context hub." into nyc-dev 2016-04-05 01:32:59 +00:00
Jeremy Joslin
dd251ef495 Have the NetworkScoreService bind to the scorer.
If the current active scorer provides a service that can handle the
android.net.scoring.SCORE_NETWORKS action then the NetworkScoreService
will bind to that service to keep the scorer alive. If no service is
discovered then no attempt to bind will be made.

BUG: 27612145
Change-Id: I3f6ed0cbd83e658f1533c3e37b0cac2692c01761
2016-04-04 18:13:29 -07:00
Bill Yi
de21fce560 Import translations. DO NOT MERGE
Change-Id: I1dc28e766598553596a3abdf05a7781b7b67f4c8
Auto-generated-cl: translation import
2016-04-04 18:01:54 -07:00
Yang Ni
14182697bb Merge "Avoid destroying Device separately" into nyc-dev 2016-04-05 00:50:42 +00:00
Pavel Zhamaitsiak
ce13079ab3 resolve merge conflicts of 20ebbb3 to nyc-dev
Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df
2016-04-04 17:42:05 -07:00
Tomasz Mikolajewski
31da1779e7 Merge "Fix perf tests for cold startup." into nyc-dev 2016-04-05 00:33:03 +00:00