Robert Greenwalt
73ed9d8dee
Fix CS/NetworkMonitor race.
...
If we have a message in flight about a NetworkAgentInfo when it gets disconnected
we are left with a zombie network. Fixes this by verifing the network is still
live before we process the msg.
bug:17142206
Change-Id: I2c94a39b3ea97c1562066571b277280c1f69f71c
2014-08-20 09:30:15 -07:00
Jason Monk
4385af32ef
Fix SOCKS proxies from being dropped from PAC
...
It seems that SOCKS isn't being handled explicitly by the
PacProxySelector, which results in them just being dropped
from the return list. This will sometimes end up switching
from SOCKS to DIRECT, which could be bad.
Bug: 17104885
Change-Id: Ic8a28230d3ae18c0abb000811a9100787c10c5e0
2014-08-20 12:21:56 -04:00
Santos Cordon
5bbe9e4166
am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev
...
* commit '3715de8f0e969c892f8a153627110f092e5527fb':
Made all classes required for an InCallService @SystemApi
2014-08-20 16:14:19 +00:00
Justin Koh
721edc540d
am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev
...
* commit 'e6a59a4c42c4c9e60a69abef966202024640f867':
Add check to allow notification listener packages to post >50 notifications
2014-08-20 16:14:14 +00:00
Lorenzo Colitti
1c3a35bcff
Fix findConnectionTypeForIface.
...
This is used by the VPN to notice when its underlying connection
has gone away. I'm fixing this using network types and not
NetworkCapabilities because
1. I don't know of a way to use the new API to get callbacks for
a specific network. You can get them based on capabilities,
but it's not clear how to construct a NetworkCapabilities
object that will only match a specific network, or only match
the default network.
2. It's a smaller change.
Bug: 15070628
Change-Id: Id6a6a183da83636c0859db4c954093bd684c01ea
2014-08-20 09:11:14 -07:00
vandwalle
da3475dba7
Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev
2014-08-20 16:06:26 +00:00
Michael Lentine
b9d1efec83
Merge "Reduce shutdown animation duration." into lmp-dev
2014-08-20 16:06:26 +00:00
Michael Lentine
0c9a62dc8d
Reduce shutdown animation duration.
...
Change-Id: Idb58e8ff9a7e05c6f3d6964970b32a6aa69615c1
2014-08-20 13:19:14 -07:00
Aravind Akella
be2ecae5fe
Merge "Step Counter documentation fix." into lmp-dev
2014-08-20 16:06:26 +00:00
Jason Monk
74d340cc33
am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev
...
* commit 'abd834f3d31c2b222decbf484818be1bef9cc4ef':
Add hotspot tile to defaults
2014-08-20 15:59:01 +00:00
John Reck
ce1846a7e6
am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev
...
* commit '0d0dbcb012596d063d52749298e84bd50c591b7b':
Don't use Animator:reverse()
2014-08-20 15:58:56 +00:00
Jorim Jaggi
a4493cb76d
am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev
...
* commit '7fda5cd78b340b4edf6072a9c749c3cff64e89f6':
Fix crash when reset() gets called during an animation
2014-08-20 15:38:17 +00:00
Jorim Jaggi
f5757bb4c9
am 69213844: Merge "Fix QS expansion weirdness #2 " into lmp-dev
...
* commit '69213844a5162e1ff9376a3f83d4ea8a73d172ad':
Fix QS expansion weirdness #2
2014-08-20 15:30:28 +00:00
Jason Monk
1416f2eafd
am 98a04b1a: Merge "Update the QS footer from UI thread" into lmp-dev
...
* commit '98a04b1a6903606631b4288b6f62b68a5a188505':
Update the QS footer from UI thread
2014-08-20 15:30:23 +00:00
John Spurlock
86f2d5c370
am 3422f40e: Merge "PowerUI: Remove the fallback dialogs." into lmp-dev
...
* commit '3422f40e3df21f94fea33f59bc9e1aeecc836423':
PowerUI: Remove the fallback dialogs.
2014-08-20 15:30:19 +00:00
John Spurlock
357aaeae52
am 6c162ab4: Merge "Remove logspam from GlobalActions." into lmp-dev
...
* commit '6c162ab4e1e09c31426c22aacb20729a00567c3e':
Remove logspam from GlobalActions.
2014-08-20 15:30:14 +00:00
Amith Yamasani
80a06c4e88
am ed084f44: Merge "Rename restrictions API class and method" into lmp-dev
...
* commit 'ed084f44c971244239f4cfa55183510d2c4fec15':
Rename restrictions API class and method
2014-08-20 15:13:50 +00:00
Paul Jensen
0311b2b31a
Fix listening NetworkRequests to listen for all networks.
...
This is a small change but should fix a number of functional problems:
1. When registering a listening NetworkRequest and when a Network is
validated, we should always add the listening NetworkRequest to the
Network's list of NetworkRequests if the Network satisfies the
NetworkRequest. Previously in both cases this was only done for
the highest scoring network. This enables the listening
NetworkRequest to listen for all networks, not just the highest
scoring network.
2. No longer add listening NetworkRequests to mNetworkForRequestId as
it doesn't make sense as it's a 1:1 mapping but listening
NetworkRequests to Networks is a many:many mapping.
3. Don't "keep" a Network that's finished validating when only a
listening NetworkRequest requests it.
4. Don't send updated scores to NetworkFactories from listening
NetworkRequests. NetworkFactories and NetworkAgents shouldn't
concern themselves with listening NetworkRequests.
bug:16680764
Change-Id: Iaba14263227771e4bd84ee4bce488beaef20a8a3
2014-08-20 14:46:11 +00:00
Paul Jensen
d6a3f7ed90
Add missing break statements to avoid unnecessary network validation.
...
The missing break statements were causing unnecessary network
validation for VPNs and networks that don't provide internet access.
bug:16680764
Change-Id: I714bacdff350a818f7bfba2f505b95c4b3559699
2014-08-20 10:12:50 -04:00
Jorim Jaggi
e7a4d87623
am da351d0d: Merge "Don\'t allow to scroll to QS if not provisioned" into lmp-dev
...
* commit 'da351d0d95b2782ccebcd1eb22ea7b7562e3ab04':
Don't allow to scroll to QS if not provisioned
2014-08-20 14:06:07 +00:00
Jorim Jaggi
c0d0fcc23a
am a4665f30: Merge "Fix accessibility actions for navigation bar" into lmp-dev
...
* commit 'a4665f302431bbd38faf524927889b3a92160fa8':
Fix accessibility actions for navigation bar
2014-08-20 13:44:45 +00:00
Selim Cinek
60ea8ac991
am cc19946d: Added notification color to all system notifications
...
* commit 'cc19946d947cf553ee9fd23778a3c811c18ae633':
Added notification color to all system notifications
2014-08-20 13:44:39 +00:00
Esteban Talavera
f057f06631
Rename PROVISIONING_NFC_MIME_TYPE to MIME_TYPE_PROVISIONING_NFC
...
As requested in the API review. References to that field fixed on changes I123a5193d03b313160f934644b02be62b8394649 and Ibf1bb38f481e9e0dd898d662b18a1c54f201f830
Bug: 17005622
Change-Id: I08c53465d98678c06f65eeed5e7e9dcdce7bbcf0
2014-08-20 13:36:05 +00:00
Christian Robertson
5455aa0f7b
Updated set of geometric navigation bar icon assets
...
Bug: 15981688
Change-Id: Id56cafc17aaf86cd3ce1cc125197fa0ce86ab56b
2014-08-20 13:21:18 +00:00
Santos Cordon
80030f90b6
Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev
2014-08-20 12:26:29 +00:00
Gabriel Peal
b95f169a74
Made all classes required for an InCallService @SystemApi
...
Bug: 17153048
Change-Id: I6b46969e976a47fd814022939a99b823fcb7b2bd
2014-08-20 16:08:53 +00:00
John Spurlock
7fa31601a6
Merge "Copy framework internal resources for indeterminate anim." into lmp-dev
2014-08-20 12:26:29 +00:00
John Spurlock
06b7b61352
Copy framework internal resources for indeterminate anim.
...
Bug:14622065
Change-Id: Icfe4df5b01f342b7d3dc792e03391dc764abd59b
2014-08-20 11:44:45 -04:00
John Spurlock
1613503ea9
Merge "PowerUI: Remove the fallback dialogs." into lmp-dev
2014-08-20 12:26:29 +00:00
John Spurlock
86c3de81ea
PowerUI: Remove the fallback dialogs.
...
- Low battery notifications are now always notifications, even
if not HUNs.
- Remove obsolete dialogs used only as HUN fallbacks.
- Extend the default HUN timeout to 10 seconds and remove the
ongoing hack for the warning notification.
Bug:17070231
Change-Id: I29069c3d90dcca6f9bce512e5a0ccbd983704de5
2014-08-20 10:54:25 -04:00
John Spurlock
82ed96a178
Merge "Remove logspam from GlobalActions." into lmp-dev
2014-08-20 12:26:29 +00:00
John Spurlock
68539a664b
Remove logspam from GlobalActions.
...
Bug:17128889
Change-Id: I7343820c1b6f174ec66c28ee7c94b6b9fb0ad1b1
2014-08-20 10:36:33 -04:00
Selim Cinek
255dd04271
Added notification color to all system notifications
...
Bug: 17128331
Change-Id: I81a94510ef51b99916f314c0dd65852426a1fbeb
2014-08-20 14:25:18 +02:00
Terry Heo
e51042f0bc
am 4a07aaa5: Merge "CEC: Broadcast language setting whenever it changes" into lmp-dev
...
* commit '4a07aaa504c7820b73acd3715cc865c725e80421':
CEC: Broadcast language setting whenever it changes
2014-08-20 07:01:53 +00:00
Jungshik Jang
a8351aac10
am 1b4afc48: Merge "Disable device when it\'s removed or disabled." into lmp-dev
...
* commit '1b4afc48001ad3b83c96cfec062f97dccfbe0bc3':
Disable device when it's removed or disabled.
2014-08-20 06:54:27 +00:00
Jungshik Jang
c7e3d1075f
am af183802: Merge "Use id to find proper HdmiDeviceInfo instead of ojbect itself." into lmp-dev
...
* commit 'af183802ff5d962630d9ad23386ea22e0340b834':
Use id to find proper HdmiDeviceInfo instead of ojbect itself.
2014-08-20 06:43:23 +00:00
Jinsuk Kim
fbe173478c
am d1cd4053: Merge "CEC: Hook up device select API to MHL device RAP" into lmp-dev
...
* commit 'd1cd4053119818bea2d3b78d18da24dd81c1dbea':
CEC: Hook up device select API to MHL device RAP
2014-08-20 05:41:45 +00:00
Terry Heo
a8833609f3
am 60e0ac1c: Merge "CEC: Fix JNI initialization error of HdmiMhlController" into lmp-dev
...
* commit '60e0ac1c4dca4effe8563038ebad27b3008009f1':
CEC: Fix JNI initialization error of HdmiMhlController
2014-08-20 05:32:47 +00:00
Jae Seo
65af27d5c7
am d5b65376: Fix the signature of nativeSendScratchpadCommand
...
* commit 'd5b653762bc956cb841a545cd81e8ef7eba70823':
Fix the signature of nativeSendScratchpadCommand
2014-08-20 03:51:29 +00:00
Jae Seo
50afbb308d
Fix the signature of nativeSendScratchpadCommand
...
Change-Id: Ie90a7317f4cf368bf84a64d72e3d8b0de2458b50
2014-08-19 20:40:03 -07:00
Sascha Prueter
3d040ef649
am d8ea6587: Merge "Compress miscellaneous fonts." into lmp-dev
...
* commit 'd8ea658752c71ce1aaf08ca33d998d7051c94a3d':
Compress miscellaneous fonts.
2014-08-20 03:26:55 +00:00
Jeff Brown
f87e528580
am 7d2a336e: Merge "Use the CAST_SETTINGS activity for Cast Screen / More Settings." into lmp-dev
...
* commit '7d2a336e37d222aefb17f4b643c4ef53bf157842':
Use the CAST_SETTINGS activity for Cast Screen / More Settings.
2014-08-20 03:19:27 +00:00
Jeff Brown
5f55b9d29c
am 53509444: Merge "Remove incomplete media router API. (DO NOT MERGE)" into lmp-dev
...
* commit '53509444443c45cf519105294f1acf3e4f0c0c1e':
Remove incomplete media router API. (DO NOT MERGE)
2014-08-20 03:19:22 +00:00
Wenchao Tong
8716fbb682
am 3ddfe1ce: Merge "Annotate @SystemApi on some WifiManager methods." into lmp-dev
...
* commit '3ddfe1ceb759ed8c746544a694be1bea6dd93ad0':
Annotate @SystemApi on some WifiManager methods.
2014-08-20 03:08:07 +00:00
Etan Cohen
307789985e
am 962f4011: Enable VoLTE with overlay configuration allowing disabling.
...
* commit '962f40115b888e983845b81627a8aee7c907e5f8':
Enable VoLTE with overlay configuration allowing disabling.
2014-08-20 02:54:19 +00:00
Adam Powell
81af1aa168
am 330a5bec: Merge "Update text selection handles to have a minimum touch target size." into lmp-dev
...
* commit '330a5bece1685fb75a0bcb3067f245ae8e802b13':
Update text selection handles to have a minimum touch target size.
2014-08-20 02:54:11 +00:00
Etan Cohen
155bbf1ea4
Enable VoLTE with overlay configuration allowing disabling.
...
Bug: 17134661
Change-Id: Ie6262b2b39848a13729a4b9d6acad10ebb91636b
2014-08-20 02:42:49 +00:00
Andre Eisenbach
4072da041d
LE: Rename new MTU and connection paramter update APIs
...
bug 17005342
Change-Id: I23151e1e92fe86896fc2883f81aef82084bb4215
2014-08-20 02:03:57 +00:00
Sascha Prueter
3d848bbef6
Merge "Compress miscellaneous fonts." into lmp-dev
2014-08-20 01:43:56 +00:00
Jungshik Jang
8d78f60eb6
am 12feec33: Merge "Clean up MHL local devices when HdmiControlService turns into disabled state" into lmp-dev
...
* commit '12feec334fd6672f42b61b7dab0f916b887e1293':
Clean up MHL local devices when HdmiControlService turns into disabled state
2014-08-20 01:30:09 +00:00