OSDN Git Service
Sudheer Shanka [Tue, 5 Apr 2016 17:28:30 +0000 (17:28 +0000)]
Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev
am:
f4b30e2
* commit '
f4b30e2147671476564c8bba6edf33aa63334f6e':
Remove the admin from the removing list when refreshing that admin.
Change-Id: Ifd93b6e4d0e495e45fec5388c941675f8edfbf37
Sudheer Shanka [Tue, 5 Apr 2016 17:21:35 +0000 (17:21 +0000)]
Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev
Junda Liu [Tue, 5 Apr 2016 17:10:17 +0000 (17:10 +0000)]
Merge "Add public API for sim authentication." into nyc-dev
am:
a27cf02
* commit '
a27cf024e5a9fac9c254a533386bcb073817ecb2':
Add public API for sim authentication.
Change-Id: Iaf27927945b40007110afb2b4e5cb9f231526a0c
Junda Liu [Tue, 5 Apr 2016 17:03:30 +0000 (17:03 +0000)]
Merge "Add public API for sim authentication." into nyc-dev
Dianne Hackborn [Tue, 5 Apr 2016 17:01:20 +0000 (17:01 +0000)]
Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev
am:
4345904
* commit '
434590405071b462573273637899599332c34187':
(Docs only) Make battery stats process state docs more clear.
Change-Id: I234a4e3532043fbe00e861bacf48c4240fc2a63b
Dianne Hackborn [Tue, 5 Apr 2016 17:01:18 +0000 (17:01 +0000)]
Merge "Fix issue #
28001806: Background check is incorrectly restricting binding of services" into nyc-dev
am:
a7d301c
* commit '
a7d301c5d4295c8bd18ca1fcf6fcd42d4edea3a0':
Fix issue #
28001806: Background check is incorrectly restricting binding of services
Change-Id: I6864c79948d9e6d10dfcd84d43a6840f3998adb7
Dianne Hackborn [Tue, 5 Apr 2016 16:54:54 +0000 (16:54 +0000)]
Merge "(Docs only) Make battery stats process state docs more clear." into nyc-dev
Dianne Hackborn [Tue, 5 Apr 2016 16:54:35 +0000 (16:54 +0000)]
Merge "Fix issue #
28001806: Background check is incorrectly restricting binding of services" into nyc-dev
Dianne Hackborn [Thu, 31 Mar 2016 01:01:41 +0000 (18:01 -0700)]
(Docs only) Make battery stats process state docs more clear.
Change-Id: I7e86705ec5fa7be8d6a74e708bbf166bec17494f
Dianne Hackborn [Mon, 4 Apr 2016 20:31:18 +0000 (13:31 -0700)]
Fix issue #
28001806: Background check is incorrectly restricting binding of services
Change-Id: Ie79937d2696e28651c8ef2bdcc5c9c84f9f801c6
Alan Viverette [Tue, 5 Apr 2016 16:35:35 +0000 (16:35 +0000)]
Merge "Rewrite popup window positioning algorithm" into nyc-dev
am:
9d8ec0f
* commit '
9d8ec0f12ee67129afb4020aa1d91599073cfeab':
Rewrite popup window positioning algorithm
Change-Id: I8e23de773a1a22278c17e8fb72d4f7b6da1c4921
Alan Viverette [Tue, 5 Apr 2016 16:29:06 +0000 (16:29 +0000)]
Merge "Rewrite popup window positioning algorithm" into nyc-dev
Glenn Kasten [Tue, 5 Apr 2016 15:08:27 +0000 (15:08 +0000)]
Merge "Fix typo" into nyc-dev
am:
5cb05f8
* commit '
5cb05f810b618112443271fdc8f1cf731593657e':
Fix typo
Change-Id: I1bc1cd930d99e82d0b5563fd8b9b0ce33184ead0
Kirill Grouchnikov [Tue, 5 Apr 2016 15:02:43 +0000 (15:02 +0000)]
Merge "Add a hidden test-only API to get Toolbar\'s navigation view." into nyc-dev
am:
bbcf432
* commit '
bbcf4327d216ff9aa9dcce57c485736d21ffed12':
Add a hidden test-only API to get Toolbar's navigation view.
Change-Id: Id24760bed597ad0b154e0ec1120d065a4627c7ea
Glenn Kasten [Tue, 5 Apr 2016 15:00:20 +0000 (15:00 +0000)]
Merge "Fix typo" into nyc-dev
Rubin Xu [Tue, 5 Apr 2016 14:56:44 +0000 (14:56 +0000)]
Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev
am:
63d1ee4
* commit '
63d1ee45eee7e01bd098c7a9694daaea300c1133':
Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two.
Change-Id: Iab160ad25bafd8850ea75fa8575b12466bf9e16b
Alan Viverette [Tue, 5 Apr 2016 14:56:42 +0000 (14:56 +0000)]
Merge "Make Material switch style public" into nyc-dev
am:
29e2d42
* commit '
29e2d427a45e6209d0ecbeae9a44938d3ccb1c04':
Make Material switch style public
Change-Id: I7672ee8123107fc68f6675b3db577f4cba7a9481
Kirill Grouchnikov [Tue, 5 Apr 2016 14:54:46 +0000 (14:54 +0000)]
Merge "Add a hidden test-only API to get Toolbar's navigation view." into nyc-dev
Rubin Xu [Tue, 5 Apr 2016 14:52:00 +0000 (14:52 +0000)]
Merge "Split ACTION_MANAGED_PROFILE_AVAILABILITY_CHANGED into two." into nyc-dev
Alan Viverette [Tue, 5 Apr 2016 14:51:02 +0000 (14:51 +0000)]
Merge "Make Material switch style public" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:30:57 +0000 (14:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
5798a42 -s ours
* commit '
5798a425ec657cbbe10025a90f5342700f569ba3':
Import translations. DO NOT MERGE
Change-Id: If9ec7dca579bfc31d4f998c8f5cecc34472474f5
Bill Yi [Tue, 5 Apr 2016 14:30:56 +0000 (14:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
06296db -s ours
* commit '
06296dbb875d69ae434974a6ed29a0f59e9116a8':
Import translations. DO NOT MERGE
Change-Id: I2473032e917628a97f357fcfb0fe2aaf7d9ebff5
Bill Yi [Tue, 5 Apr 2016 14:22:20 +0000 (14:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:21:51 +0000 (14:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:20:17 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
22092d7 -s ours
* commit '
22092d779473a52e78528a7de0fcc3cdc50569de':
Import translations. DO NOT MERGE
Change-Id: I37e5a059dca250763aadb74ac365914443bd237c
Bill Yi [Tue, 5 Apr 2016 14:20:15 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
ba6880e -s ours
* commit '
ba6880ec51fd1a973cedd0a3ec7483a63ff16905':
Import translations. DO NOT MERGE
Change-Id: I8c50c426ac0525cb3f87611b87a798f3a8e0b545
Bill Yi [Tue, 5 Apr 2016 14:20:13 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
8a9cc71 -s ours
* commit '
8a9cc710f21badcd5aad74bef17fff747bb913a3':
Import translations. DO NOT MERGE
Change-Id: Ic4792302103b470fe3a5e5d582c87f012098849d
Alan Viverette [Tue, 5 Apr 2016 14:20:10 +0000 (14:20 +0000)]
Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev
am:
16aaa3e
* commit '
16aaa3e5355a8a7213bb4cce8383108b9430e3e2':
Fix bad workaround docs in Resources.getDrawable()
Change-Id: Id40f9e082b21be5d550661a39c0bf826b03159aa
Bill Yi [Tue, 5 Apr 2016 14:20:07 +0000 (14:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
a0480cc -s ours
* commit '
a0480cc36b5850ce0621ebe62fa350c4dde5d1b5':
Import translations. DO NOT MERGE
Change-Id: Id3dbe0dc7b9284e1136167bb2a8e1e38281371c9
Bill Yi [Tue, 5 Apr 2016 14:16:48 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:16:17 +0000 (14:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:15:40 +0000 (14:15 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Alan Viverette [Tue, 5 Apr 2016 14:15:09 +0000 (14:15 +0000)]
Merge "Fix bad workaround docs in Resources.getDrawable()" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 14:14:56 +0000 (14:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Alan Viverette [Tue, 5 Apr 2016 14:14:27 +0000 (10:14 -0400)]
Make Material switch style public
Bug:
28001482
Change-Id: I0dcbf585db13d2efffd09ec0e329170114f372a1
Jason Monk [Tue, 5 Apr 2016 14:13:32 +0000 (14:13 +0000)]
Revert "Add Preference#onDetachedFromActivity"
am:
b65b710
* commit '
b65b7105cd5d20bf8a9f9c1b10afd6df968bc442':
Revert "Add Preference#onDetachedFromActivity"
Change-Id: I78a6d99746507b6cde29f25bf161693c5ced4128
Robin Lee [Tue, 5 Apr 2016 14:13:30 +0000 (14:13 +0000)]
Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev
am:
691b1a6
* commit '
691b1a6005ed373ad75361aa5a1bd120f138f15c':
Switch to work challenge if MP calls resetPassword
Change-Id: I705c5a52e2a2cae96e0c0df8a2ec50c9b8ae2300
Jason Monk [Mon, 4 Apr 2016 13:19:31 +0000 (13:19 +0000)]
Revert "Add Preference#onDetachedFromActivity"
This reverts commit
e18dc50c63110a57cfc29ec9bd21bf3f59abb6b4.
Fixes:
27807793
Change-Id: Ib0384e3deb8d6376265e8e60f14490de128c9b68
(cherry picked from commit
eff3ca5480789c51768a3a1697503fbbdadc1bd6)
Robin Lee [Tue, 5 Apr 2016 14:04:39 +0000 (14:04 +0000)]
Merge "Switch to work challenge if MP calls resetPassword" into nyc-dev
Jason Monk [Tue, 5 Apr 2016 13:54:38 +0000 (13:54 +0000)]
Merge "Fix Build" into nyc-dev
am:
723a65a
* commit '
723a65a51b651f458cc45dc089165431fc27c896':
Fix Build
Change-Id: Iffaadb5a222694a9b7310abc72c644357d40393d
Jason Monk [Tue, 5 Apr 2016 13:49:40 +0000 (13:49 +0000)]
Merge "Fix Build" into nyc-dev
Jason Monk [Tue, 5 Apr 2016 13:47:40 +0000 (09:47 -0400)]
Fix Build
Previous revert didn't catch test-current.txt
Change-Id: I82575361bcc4f3c7e05dbec4cbe5201b03717bcb
Bill Yi [Tue, 5 Apr 2016 13:44:13 +0000 (06:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ibc7139b72a805e48a1906368d25df01e55f68b9b
Auto-generated-cl: translation import
Lorenzo Colitti [Tue, 5 Apr 2016 13:39:10 +0000 (13:39 +0000)]
Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
am:
19e84f7
* commit '
19e84f7b750c97d5d7440af16c7ba18bf759e5dc':
Clean up netd state when tethering fails.
Clear LinkProperties on interface removed.
Change-Id: I3e6593324fa955ab3c0e590655d0632347f83ec8
Bill Yi [Tue, 5 Apr 2016 13:37:59 +0000 (06:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iacf5ebcf0264fa13b097db13948f9b880f8e19c2
Auto-generated-cl: translation import
Lorenzo Colitti [Tue, 5 Apr 2016 13:35:07 +0000 (13:35 +0000)]
Merge changes Ibb63f6b4,Ib64559a5 into nyc-dev
* changes:
Clean up netd state when tethering fails.
Clear LinkProperties on interface removed.
Lorenzo Colitti [Tue, 5 Apr 2016 08:53:04 +0000 (17:53 +0900)]
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
Lorenzo Colitti [Tue, 5 Apr 2016 08:48:28 +0000 (17:48 +0900)]
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
Keisuke Kuroyanagi [Tue, 5 Apr 2016 09:30:51 +0000 (09:30 +0000)]
Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev
am:
a46be16
* commit '
a46be16612573ce083404e8731a96ec30eba3c48':
Fix: Selection handle behavior in scrolled TextView.
Change-Id: I36d2bb4d219242c9fe6cc159a0cd3f55489687dd
Keisuke Kuroyanagi [Tue, 5 Apr 2016 09:24:07 +0000 (09:24 +0000)]
Merge "Fix: Selection handle behavior in scrolled TextView." into nyc-dev
Diego Perez [Tue, 5 Apr 2016 08:23:28 +0000 (08:23 +0000)]
Merge "Separate inflate from render step" into nyc-dev
am:
4ce88b1
* commit '
4ce88b10ab1c593d80643878cc6e90edc81b6aab':
Separate inflate from render step
Change-Id: I1a65f91ce73a0137f6b24977520578ae246c5d59
Diego Perez [Tue, 5 Apr 2016 08:17:45 +0000 (08:17 +0000)]
Merge "Separate inflate from render step" into nyc-dev
Keisuke Kuroyanagi [Tue, 5 Apr 2016 07:56:30 +0000 (07:56 +0000)]
Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev
am:
a1a56ed
* commit '
a1a56ed09cb3977c580098113a221c7764d31a58':
Stop automatically creating action mode in FS extracted mode.
Change-Id: Ia74579cbd4115e3be10ded33cecb0fb16ffe6e90
Keisuke Kuroyanagi [Tue, 5 Apr 2016 07:50:45 +0000 (07:50 +0000)]
Merge "Stop automatically creating action mode in FS extracted mode." into nyc-dev
Bill Yi [Tue, 5 Apr 2016 07:32:16 +0000 (00:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I127b5c781f20c942712801cf9b044d7b27403b07
Auto-generated-cl: translation import
Keisuke Kuroyanagi [Tue, 5 Apr 2016 07:26:16 +0000 (16:26 +0900)]
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
Bill Yi [Tue, 5 Apr 2016 07:18:26 +0000 (00:18 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib8200b22451664277e49d59489e1727b281fa960
Auto-generated-cl: translation import
Bill Yi [Tue, 5 Apr 2016 07:12:38 +0000 (00:12 -0700)]
Import translations. DO NOT MERGE
Change-Id: I313e43e4b0f2f90265415bfb36ac3316dcb58e00
Auto-generated-cl: translation import
Bill Yi [Tue, 5 Apr 2016 07:08:13 +0000 (00:08 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ee1e4554a52b1932121c963a8dd99a19e8bc990
Auto-generated-cl: translation import
Aga Wronska [Tue, 5 Apr 2016 04:39:18 +0000 (04:39 +0000)]
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
am:
2209860
* commit '
2209860597ce73a45b3925d3bd71cf54e9fa6296':
Hide 'select all' menu option when ALLOW_MULTIPLE intent is not passed in DocumentsActivity. Make 'select all' select only enabled files.
Change-Id: I95f08498ce97d9b16a1170ed8dc2e84fa4f7636b
Pavel Zhamaitsiak [Tue, 5 Apr 2016 04:34:50 +0000 (04:34 +0000)]
Merge "resolve merge conflicts of
20ebbb3 to nyc-dev" into nyc-dev
am:
f8565cd
* commit '
f8565cd3f30c60d8343dae3ca8c8bca18c5b451a':
ConnectivityMetricsLogger: Switch to "pull" model
Change-Id: Ic01fa847282f4d8b37c85c1b877a85df73401200
Aga Wronska [Tue, 5 Apr 2016 04:34:08 +0000 (04:34 +0000)]
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
Pavel Zhamaitsiak [Tue, 5 Apr 2016 04:29:11 +0000 (04:29 +0000)]
Merge "resolve merge conflicts of
20ebbb3 to nyc-dev" into nyc-dev
Erik Kline [Tue, 5 Apr 2016 04:07:20 +0000 (04:07 +0000)]
Merge "Delete unused default DNS setting code" into nyc-dev
am:
39ca5c2
* commit '
39ca5c22808a8d7bd82c2fdbeaf4e389da450857':
Delete unused default DNS setting code
Change-Id: I927c571672c374248766f4e6031fae38509ade41
Sudheer Shanka [Fri, 1 Apr 2016 01:59:03 +0000 (18:59 -0700)]
Remove the admin from the removing list when refreshing that admin.
Change-Id: I9b597a116db4f1fb894427b4e885f29c3e94abdb
Fixes:
27909181
Erik Kline [Tue, 5 Apr 2016 04:02:38 +0000 (04:02 +0000)]
Merge "Move from on464XlatChange() to setNeighborDiscoveryOffload()" into nyc-dev
am:
5db3f10
* commit '
5db3f10e9a1f2ffb65776ae0ab84789204e9b336':
Move from on464XlatChange() to setNeighborDiscoveryOffload()
Change-Id: I3f76a175fc7ecda56c75b4d153eddee5aecbca7c
Erik Kline [Tue, 5 Apr 2016 04:00:27 +0000 (04:00 +0000)]
Merge "Delete unused default DNS setting code" into nyc-dev
Erik Kline [Tue, 5 Apr 2016 03:55:40 +0000 (03:55 +0000)]
Merge "Move from on464XlatChange() to setNeighborDiscoveryOffload()" into nyc-dev
Bill Yi [Tue, 5 Apr 2016 03:27:27 +0000 (03:27 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
f7d28fa -s ours
* commit '
f7d28faa04abe3e163fc4b62437f900969caf309':
Import translations. DO NOT MERGE
Change-Id: I3d4187df3a7ffe07f3800302b745d6355c9f31de
Bill Yi [Tue, 5 Apr 2016 03:22:26 +0000 (03:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Paul Jensen [Tue, 5 Apr 2016 02:53:21 +0000 (02:53 +0000)]
Merge "Add APF code to drop ARP IPv4 requests not for us" into nyc-dev
am:
cd404a2
* commit '
cd404a2fc34a967f0763fb3b6b43f56a5d8014e8':
Add APF code to drop ARP IPv4 requests not for us
Change-Id: I84e20d1731569ae9f047600f9e26a3da22bb7d39
Erik Kline [Tue, 5 Apr 2016 02:48:01 +0000 (11:48 +0900)]
Delete unused default DNS setting code
Change-Id: I601a647714171f205d179d6fef6c112949fc5a94
Lorenzo Colitti [Tue, 5 Apr 2016 02:46:38 +0000 (02:46 +0000)]
Merge "Add APF code to drop ARP IPv4 requests not for us" into nyc-dev
Erik Kline [Mon, 4 Apr 2016 03:46:51 +0000 (12:46 +0900)]
Move from on464XlatChange() to setNeighborDiscoveryOffload()
Bug:
26238390
Change-Id: I0f971fbf04e44cb61017653f944d71e1f6d128b4
Adam Lesinski [Tue, 5 Apr 2016 02:28:26 +0000 (02:28 +0000)]
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
am:
a149c42
* commit '
a149c42071197a7759a652accb399bc58ed62bcd':
Fix issue with overridden configuration in onConfigurationChanged
Change-Id: I034e9ad42bf8e94ca97fd536ba1498fe19f01118
Adam Lesinski [Tue, 5 Apr 2016 02:22:50 +0000 (02:22 +0000)]
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
sergeyv [Tue, 5 Apr 2016 01:59:30 +0000 (01:59 +0000)]
Merge "Fix opacity setup in FrameBuilder" into nyc-dev
am:
5169c62
* commit '
5169c62c6c0acbf9d5a36a90233e7ba2e9532e58':
Fix opacity setup in FrameBuilder
Change-Id: Ic887d694e745d365b8e0cfe335814e0ecd8e682f
Yang Ni [Tue, 5 Apr 2016 01:57:15 +0000 (01:57 +0000)]
Merge "Avoid destroying Device separately" am:
a314384d
am:
6cecf0c
* commit '
6cecf0c8500083d33b355aa7c901cf1c1eefd39c':
Avoid destroying Device separately
Change-Id: I77fb87acaaeed9d23d4b8046031735cdbd3be67d
Yang Ni [Tue, 5 Apr 2016 01:54:57 +0000 (01:54 +0000)]
Merge "Avoid destroying Device separately"
am:
a314384d
* commit '
a314384dc9785f97bf0f3bb9256f6ea2c765930c':
Avoid destroying Device separately
Change-Id: Ia9b269456b01b9ba1f742c674449392fb6601599
Sergei Vasilinetc [Tue, 5 Apr 2016 01:54:46 +0000 (01:54 +0000)]
Merge "Fix opacity setup in FrameBuilder" into nyc-dev
Yang Ni [Tue, 5 Apr 2016 01:49:21 +0000 (01:49 +0000)]
Merge "Avoid destroying Device separately"
Paul Jensen [Fri, 25 Mar 2016 15:25:57 +0000 (11:25 -0400)]
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
Ashutosh Joshi [Tue, 5 Apr 2016 01:37:49 +0000 (01:37 +0000)]
Merge "App upload to Context hub." into nyc-dev
am:
b4cc448
* commit '
b4cc448946b2edb5802f60a3b1f97efbc8dd7ea0':
App upload to Context hub.
Change-Id: I273a0503e847cd3fc3fadf85f65d5e5518bd1271
Ashutosh Joshi [Tue, 5 Apr 2016 01:32:57 +0000 (01:32 +0000)]
Merge "App upload to Context hub." into nyc-dev
Bill Yi [Tue, 5 Apr 2016 01:01:54 +0000 (18:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1dc28e766598553596a3abdf05a7781b7b67f4c8
Auto-generated-cl: translation import
Yang Ni [Mon, 4 Apr 2016 17:23:57 +0000 (10:23 -0700)]
Avoid destroying Device separately
Bug:
27983025
Device should be destroyed inside the destructor of the associated
Context.
Change-Id: I921a89974e1174f837349a89aef9b03efa4882f5
(cherry picked from commit
4a70df58a32591429ec04902deac2b2210fb96c3)
Yang Ni [Tue, 5 Apr 2016 00:55:37 +0000 (00:55 +0000)]
Merge "Avoid destroying Device separately" into nyc-dev
am:
1418269
* commit '
14182697bbaeee70fd78bd12e8e7d87254415eae':
Avoid destroying Device separately
Change-Id: Iecd5d3b1288dfab8a3713b8b54180e6e6d0de3d8
Yang Ni [Tue, 5 Apr 2016 00:50:40 +0000 (00:50 +0000)]
Merge "Avoid destroying Device separately" into nyc-dev
Pavel Zhamaitsiak [Tue, 5 Apr 2016 00:42:05 +0000 (17:42 -0700)]
resolve merge conflicts of
20ebbb3 to nyc-dev
Change-Id: I31d76a02456b3f09a6bdac11c6dbc5e913f5f7df
Tomasz Mikolajewski [Tue, 5 Apr 2016 00:36:20 +0000 (00:36 +0000)]
Merge "Fix perf tests for cold startup." into nyc-dev
am:
31da177
* commit '
31da1779e70b9a39c16d2bcc2c3cbb34785cb13b':
Fix perf tests for cold startup.
Change-Id: I677c6b6636442d3f4fd7435de56a1de15e21a65d
Tomasz Mikolajewski [Tue, 5 Apr 2016 00:33:01 +0000 (00:33 +0000)]
Merge "Fix perf tests for cold startup." into nyc-dev
Paul Jensen [Tue, 5 Apr 2016 00:28:29 +0000 (00:28 +0000)]
Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev
am:
10d70bf
* commit '
10d70bff61af5b9c88ce2a3124b2ffbc3a3424fb':
Fix potential ApfFilter bugs by careful ByteBuffer use
Change-Id: Ia2819f1b8fb3e6cd2f728647eba13e978ea30a94
Paul Jensen [Tue, 5 Apr 2016 00:28:27 +0000 (00:28 +0000)]
Merge "Plumb WiFi multicast filter through to ApfFilter" into nyc-dev
am:
1059494
* commit '
10594942c63e5696b45be7bcc12758f46f5d1a19':
Plumb WiFi multicast filter through to ApfFilter
Change-Id: Ifb48a372d0335f7025be1e7f4004bb0b9cb1fc9d
Aga Wronska [Tue, 5 Apr 2016 00:28:25 +0000 (00:28 +0000)]
Merge "Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent" into nyc-dev
am:
ac4c87f
* commit '
ac4c87f5807b2c36caaf32afaf4765fc97bc6922':
Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent
Change-Id: I9bcbae73b4bc30f45f546a59586cd8a7fd4c1ee5
sergeyv [Tue, 5 Apr 2016 00:12:04 +0000 (17:12 -0700)]
Fix opacity setup in FrameBuilder
bug:
27941278
Change-Id: Ib0599f669406d2fb477d51d5ba701a89f83f9bd9
Paul Jensen [Tue, 5 Apr 2016 00:23:36 +0000 (00:23 +0000)]
Merge "Fix potential ApfFilter bugs by careful ByteBuffer use" into nyc-dev
Paul Jensen [Tue, 5 Apr 2016 00:22:20 +0000 (00:22 +0000)]
Merge "Plumb WiFi multicast filter through to ApfFilter" into nyc-dev
Aga Wronska [Tue, 5 Apr 2016 00:20:52 +0000 (00:20 +0000)]
Merge "Make Metrics.logKeyboardAction() method take @KeyboardAction type instead of KeyEvent" into nyc-dev
Makoto Onuki [Tue, 5 Apr 2016 00:18:13 +0000 (00:18 +0000)]
Merge "Do not enable binder exception logging." into nyc-dev
am:
eae454b
* commit '
eae454b4fd73ec7b56228030eb953d365d6cacc5':
Do not enable binder exception logging.
Change-Id: I11bd7694e27174e6886378aba92e3dfb87ee036a
Yohei Yukawa [Tue, 5 Apr 2016 00:13:24 +0000 (00:13 +0000)]
Merge "Unhide View#dispatch{Start,Finish}TemporaryDetach()" into nyc-dev
am:
807c3a8
* commit '
807c3a828b97e6d619f2dfdfde2f97efc873f6fe':
Unhide View#dispatch{Start,Finish}TemporaryDetach()
Change-Id: I1e34c5dd1ce5d942def740224df56db35e0c7d95
OSDN Git Service
