Paul Stewart
3b35155868
Properly map EAP-GTC for TTLS am: 274042519d
...
am: 173aa05908
2016-02-19 15:32:58 +00:00
Paul Stewart
173aa05908
Properly map EAP-GTC for TTLS
...
am: 274042519d
2016-02-19 15:29:04 +00:00
Ben Wagner
2a9e511111
Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev am: 31af215b26
...
am: 85e9e69cc7
2016-02-19 15:13:26 +00:00
Paul Stewart
274042519d
Properly map EAP-GTC for TTLS
...
The "auth=GTC" method was never valid for the TTLS outer
authentication for wpa_supplicant. Instead, to perform
GTC authentication within TTLS, we should use EAP-GTC.
This CL performs this mapping within WifiEnterpriseConfig.
It accomplishes this by making the EAP Method and Phase 2
Method parameters a part of the internal object state
instead of maintaining this value within the mFields
hashmap.
Further, the problematic "getFields" method is removed
since as this actually provided read/write access to the
entirety of the WifiEnterpriseConfig's internal state.
This was understandably suboptimal. All callers have
been updated to either use getFieldValue() or to call
a newly added getSupplicantFields() / setSupplicantFields()
methods which make the WifiEnterpriseConfig object a sole
arbiter for the mapping between its internal state and
wpa_supplicant.
In the future it might be good to change this logic to
strip WifiEnterpriseConfig of all of the string hashmap
entirely, leaving WifiEnterpriseConfig as a "struct"
and move supplicant mappings to WifiConfigStore.
Bug:26400915
Change-Id: I866e2f77ad53d9a51c5f61acb9adef522661f721
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
2016-02-19 07:10:31 -08:00
Ben Wagner
85e9e69cc7
Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev
...
am: 31af215b26
2016-02-19 15:09:37 +00:00
Ben Wagner
31af215b26
Merge "Use UTF32 directly in HarfBuzz<->Skia interface." into nyc-dev
2016-02-19 15:03:48 +00:00
Kenny Guy
39b8b5e314
Merge "Allow widget hosts to see widgets from locked profiles." into nyc-dev am: 477ecd7622
...
am: ffd13ac5de
2016-02-19 14:50:19 +00:00
Kenny Guy
ffd13ac5de
Merge "Allow widget hosts to see widgets from locked profiles." into nyc-dev
...
am: 477ecd7622
2016-02-19 14:45:33 +00:00
Kenny Guy
477ecd7622
Merge "Allow widget hosts to see widgets from locked profiles." into nyc-dev
2016-02-19 14:40:07 +00:00
Kenny Guy
33f9a9c21a
Allow widget hosts to see widgets from locked profiles.
...
Avoid launchers removing widgets by handling case
where a widget host is in an unlocked parent user and
widget providers are in a locked managed profile.
For this case allow launcher to see the widgets from
non-crypto aware widget providers.
Mask out widgets from locked profiles.
Fix issue with widgets not being masked when adding
new widgets when user is locked / quiet or package
is suspended.
Bug: 26721345
Bug: 27037962
Change-Id: I60b5bd934c1547110e374ab4eefbee6aade37dc6
2016-02-19 14:31:29 +00:00
Narayan Kamath
0762586970
Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev am: 92584673d6
...
am: f6abd1555e
2016-02-19 13:56:48 +00:00
Narayan Kamath
f6abd1555e
Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev
...
am: 92584673d6
2016-02-19 13:52:42 +00:00
Narayan Kamath
92584673d6
Merge "Track libcore commit aaebe4e16c487da7555cd230265acc211389781d." into nyc-dev
2016-02-19 13:46:38 +00:00
Calin Juravle
d96d2ddc23
Change the location of profile files.
...
Bug: 26719109
Bug: 26563023
Change-Id: I8e9e03a58a7926c72283788c5eb49ae680e85cc3
2016-02-19 13:42:02 +00:00
Neil Fuller
5942b1bf9b
Merge "Add flags needed to switch Jack to 1.8 for CTS targets" am: b97cfe8076 am: e3ced5b642 -s ours
...
am: fcd44f9b6b
2016-02-19 13:35:49 +00:00
Neil Fuller
fcd44f9b6b
Merge "Add flags needed to switch Jack to 1.8 for CTS targets" am: b97cfe8076
...
am: e3ced5b642
2016-02-19 13:32:02 +00:00
Lenka Trochtova
fd615739ba
Allow ephemeral users on the split-system-user systems only. am: 024f979dfd
...
am: 2e0dc6c0fc
2016-02-19 12:43:32 +00:00
Lenka Trochtova
2e0dc6c0fc
Allow ephemeral users on the split-system-user systems only.
...
am: 024f979dfd
2016-02-19 12:39:50 +00:00
Neil Fuller
e3ced5b642
Merge "Add flags needed to switch Jack to 1.8 for CTS targets"
...
am: b97cfe8076
2016-02-19 11:55:16 +00:00
Neil Fuller
b97cfe8076
Merge "Add flags needed to switch Jack to 1.8 for CTS targets"
2016-02-19 11:49:18 +00:00
Neil Fuller
855585f3c9
Add flags needed to switch Jack to 1.8 for CTS targets
...
When linking against .jack files that contain 1.8 language
features Jack (currently) requires -D jack.java.source.version=1.8.
"core-tests" includes 1.8 language features.
Bug: 27113322
Bug: 26953739
Change-Id: I640b2ae6eeec17cab5cbc0bf7a4d54c4e4d35ccd
2016-02-19 11:46:19 +00:00
Narayan Kamath
02545f5dd2
Track libcore commit aaebe4e16c487da7555cd230265acc211389781d.
...
bug: 27186457
Change-Id: Ibd7d246893d9a97c8eea0e80d181cf2a5313b2d3
2016-02-19 11:41:27 +00:00
Neil Fuller
f2b320b4f7
Merge changes from topic \'java_util_function_tests\' am: 6b50207596 am: 1f87f1e971 -s ours
...
am: bad2e4edd1
2016-02-19 10:50:48 +00:00
Neil Fuller
bad2e4edd1
Merge changes from topic \'java_util_function_tests\' am: 6b50207596
...
am: 1f87f1e971
2016-02-19 10:46:19 +00:00
Neil Fuller
1f87f1e971
Merge changes from topic \'java_util_function_tests\'
...
am: 6b50207596
2016-02-19 10:34:14 +00:00
Neil Fuller
6b50207596
Merge changes from topic 'java_util_function_tests'
...
* changes:
Add flags needed to switch Jack to 1.8 for CTS targets
Add flags needed to switch Jack to 1.8 for CTS targets
2016-02-19 10:28:30 +00:00
Lenka Trochtova
024f979dfd
Allow ephemeral users on the split-system-user systems only.
...
BUG: 27143201
Change-Id: I37f3ca7366648dbf07df39a7a972857e0ff78a9a
2016-02-19 11:11:26 +01:00
Esteban Talavera
0bd7f498af
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev am: 44da29407f
...
am: d76c5fedc8
2016-02-19 09:45:57 +00:00
Esteban Talavera
d76c5fedc8
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
...
am: 44da29407f
2016-02-19 09:42:28 +00:00
Esteban Talavera
44da29407f
Merge "Update DevicePolicyManager parent instance documentation" into nyc-dev
2016-02-19 09:37:23 +00:00
Wei Wang
14008fcaab
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev am: 0db6066c7b am: 0a05e4aef9
...
am: f2ff11238a
2016-02-19 09:34:49 +00:00
Wei Wang
f2ff11238a
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev am: 0db6066c7b
...
am: 0a05e4aef9
2016-02-19 09:31:04 +00:00
Wei Wang
0a05e4aef9
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
...
am: 0db6066c7b
2016-02-19 09:27:19 +00:00
Toby Sargeant
66877c609d
Merge "add developer setting for multiprocess webview" into nyc-dev am: a7000fa864
...
am: 9381d8c44b
2016-02-19 09:22:52 +00:00
Wei Wang
0db6066c7b
Merge "Add Java API for secure RTT protocol." into mm-wireless-dev
2016-02-19 09:22:44 +00:00
Toby Sargeant
9381d8c44b
Merge "add developer setting for multiprocess webview" into nyc-dev
...
am: a7000fa864
2016-02-19 09:19:02 +00:00
Toby Sargeant
a7000fa864
Merge "add developer setting for multiprocess webview" into nyc-dev
2016-02-19 09:14:56 +00:00
Daichi Hirono
f578fa275a
Update object info when writing a file.
...
The MTP spec does not offer a way to update bytes of exisitng files, so
our provider implementation creates a new file with new bytes and
removes old one.
Previously the new file uses new document ID and the exising document ID
is expired. Also the provider does not update the metadata
database. Thus users see the old flie in DocumentsUI but actually the
files is not accessible.
The CL updates the database with exisitng document ID, so that we can
access the new file with exisiting document ID.
BUG=26549400
Change-Id: I629b707a2e662b34625e8b28857ef818d8933996
2016-02-19 18:05:42 +09:00
Mitchell Wills
86821c07c2
DO NOT MERGE Disable failing test case
...
Bug: 27258801
Change-Id: I832505e0feca9f0abbf627d009d5982a4437bf83
2016-02-19 07:59:20 +00:00
Mitchell Wills
733fc6b6f9
Fix FastXmlSerializerTest
...
Change-Id: Ie984abae588927e65bdeffa5a6f5c58bd6ba0bf1
2016-02-18 23:43:30 -08:00
Mitchell Wills
c91e57c1aa
Remove AsyncChannelTest because it does not test anything
...
Change-Id: I7d3fe580a8c32ef3bd10895b51a7fc436f79919f
2016-02-18 23:37:14 -08:00
Lorenzo Colitti
e9ece98cd6
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev am: 5947d11119 am: acaf80910d
...
am: e4c65b2024
2016-02-19 06:43:57 +00:00
Mitchell Wills
23468c67e3
Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev am: 019fb9f4e4 -s ours am: e9e2990baf
...
am: fc5ac6c9c9
2016-02-19 06:42:48 +00:00
Lorenzo Colitti
e4c65b2024
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev am: 5947d11119
...
am: acaf80910d
2016-02-19 06:39:09 +00:00
Mitchell Wills
fc5ac6c9c9
Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev am: 019fb9f4e4 -s ours
...
am: e9e2990baf
2016-02-19 06:36:30 +00:00
Colin Cross
41bf778441
resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
...
am: 4bf50e486f
2016-02-19 06:32:06 +00:00
Colin Cross
4bf50e486f
resolve merge conflicts of bd45c08468 to nyc-dev-plus-aosp
...
Change-Id: Ifdf52646440b65ca4b3aadc8bba212b5f1fd0c0d
2016-02-18 22:27:04 -08:00
Colin Cross
bd45c08468
Merge "Add dumpsys meminfo --unreachable"
...
am: 916ea08119
2016-02-19 06:14:50 +00:00
Colin Cross
916ea08119
Merge "Add dumpsys meminfo --unreachable"
2016-02-19 06:10:36 +00:00
Lorenzo Colitti
acaf80910d
Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev
...
am: 5947d11119
2016-02-19 06:08:15 +00:00
