217602 Commits

Author SHA1 Message Date
Erik Kline
8d6edc3270 Add 464xlat notification callback
Bug: 26238390
Bug: 26991160
Change-Id: I556e779c642d19cd8d26637dd98055157d005f77
2016-03-02 16:50:46 +09:00
Erik Kline
b9df11099f Add constructor with more inputs for dependency injection.
Bug: 26991160
Bug: 27406552
Change-Id: If4a0a2f1afb1da4ad59df9eb31c540047c84659b
2016-03-01 14:58:30 +09:00
Tyler Gunn
4aeafd8f27 Merge "IMS Connection Capabilities Update" into mm-wireless-dev 2016-02-29 18:06:25 +00:00
Omkar Kolangade
99eb21d172 IMS: ImsCallProfile Extra For Call Pull
Adding an extra that will be used by IMS
Service to specify whether a call has been
pulled from another device.

BUG=27340495
Change-Id: Ic3b5a07404d63bfadcaa8bf88d6f077165251b92
2016-02-26 17:48:16 +00:00
Omkar Kolangade
f38780b483 IMS: Reason Codes For Call Pull Scenarios
Adding reason codes for call pull success
and failure scenarios.

BUG=27340495
Change-Id: I775316f52ed13862981500ebe035ee626adc934f
2016-02-25 15:49:08 -08:00
Mitchell Wills
9505e0ac3f Merge "Modify WakeupMessage to only send the message if not canceled" into mm-wireless-dev 2016-02-25 23:36:29 +00:00
Pavel Zhamaitsiak
d76b7ee263 Merge "Add registrationAssociatedUriChanged to ImsRegistrationListener" into mm-wireless-dev 2016-02-25 19:43:31 +00:00
Mitchell Wills
634c1f9d0d Modify WakeupMessage to only send the message if not canceled
Change-Id: I9ca6d3726fe25c706b644bf61119837a7cbe6db1
2016-02-24 20:17:39 -08:00
Randy Pan
366da67282 Retire ScanResult.autoJoinStatus
This attribute is no longer in use.

Bug: 27340037
Change-Id: I2e5dfdc266673388a55ef34a4d088352d2e1723c
2016-02-24 16:51:05 -08:00
Pavel Zhamaitsiak
ae4cc1519d Add registrationAssociatedUriChanged to ImsRegistrationListener
This callback will be used to pass list of associated URIs.
It is needed in case SIM doesn't have line1Number populated.

Bug: 24613146
Change-Id: I698ce58dbedb858dc59836069e6f10fec6d02ae6
2016-02-24 14:20:53 -08:00
Nathan Harold
17469433e3 Merge "Adding Error Codes for IWLAN/EPDG Connection" into mm-wireless-dev 2016-02-24 19:55:52 +00:00
Shishir Agrawal
d94fbf85d6 Merge "DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager." into mm-wireless-dev 2016-02-24 17:33:11 +00:00
Pierre Imai
51e4acb29d Merge "Add Connectivity Metrics Logger service" into mm-wireless-dev 2016-02-24 04:49:24 +00:00
Shishir Agrawal
658d3c8b3a DO NOT MERGE: Multi-SIM - Fixing inconsistent naming in CarrierConfigManager.
All MSIM specific calls should not use a suffix/prefix.

Bug: 26772894
Change-Id: I49488dfc41bb7996a1a44447968ec11132e4dac7
2016-02-23 15:18:23 -08:00
Shishir Agrawal
29c490bcd3 Merge "DO NOT MERGE: Add subscription specific TelephonyManager calls." into mm-wireless-dev 2016-02-23 22:59:23 +00:00
Pankaj Kanwar
2339b786c7 Merge changes from topic 'notification' into mm-wireless-dev
* changes:
  Changing string in notification when data is blocked. b/25209821
  Changing string in notification when data is blocked. b/25209821
2016-02-23 21:32:15 +00:00
Nathan Harold
4b6d38938e Adding Error Codes for IWLAN/EPDG Connection
-Error codes related to tunnel maintenance
-Error code for DPD

Bug: 26014044
Bug: 26014458
Change-Id: Ic00a14e0502fa47e20e79a3c6ce91b3170f53a50
2016-02-23 13:25:17 -08:00
Etan Cohen
ad3693d59b [NAN] API cleanup - rename FLAGS. [DO NOT MERGE]
Per API guidelines - non-overlapping constants can be (should be)
named with "FLAG".

Bug: 27122760
Change-Id: If8b2c0f9b2818215a64b5635e76731c8fdfd3b8d
2016-02-23 16:44:09 +00:00
Roshan Pius
2d3bea7f01 Merge "Modify the wake reasons data structure(2/2)" into mm-wireless-dev 2016-02-23 16:08:25 +00:00
Pavel Zhamaitsiak
02b3e6bfc5 Add Connectivity Metrics Logger service
This service can be used to pass events to metrics collection service

Change-Id: I213874300693cd121f2c8676f70893315de4c4c0
2016-02-23 17:32:53 +09:00
Lorenzo Colitti
6f027b4f06 Merge "Add a unit test for MessageUtils." into mm-wireless-dev 2016-02-23 07:43:40 +00:00
Wei Wang
3c0d65de0b Merge "Disallow duplicate listeners for WifiScanner." into mm-wireless-dev 2016-02-23 05:09:38 +00:00
Roshan Pius
718df42b23 IpConfigStore: New constructor to accept writer
Add a new constructor to accept a DelayeDiskWrite object from the
caller.

BUG: 27293150
Change-Id: I13fb86c76ee5a0d05b45fec0c42b7e1b2233ee76
TEST: `runtest frameworks-wifi`
2016-02-22 17:13:47 -08:00
pkanwar
e64afb84be Changing string in notification when data is blocked.
b/25209821

Change-Id: I8b0a4614c7052a1203f5d225e1977c7e358a0dbc
2016-02-22 11:17:19 -08:00
Erik Kline
c3b52bc466 Delete all NetworkUtils DHCP-related code.
Bug: 26991160
Change-Id: I2c74e0161f43f65c1b6a85dc9f294b64c8f1ae6e
2016-02-22 15:14:31 +09:00
Erik Kline
b242549166 Give bluetooth sufficient capabilities to run DhcpClient
Specifically:
    CAP_NET_RAW
    CAP_NET_BIND_SERVICE

Bug: 26991160
Change-Id: I2afddc9efa3b613d974afb0ea33703948203d99a
2016-02-22 15:14:31 +09:00
Erik Kline
111d55658b Add WaitForProvisioningCallback
This centralizes code that is shared by both bluetooth and ethernet
transport layers.

Bug: 26991160
Change-Id: I8e2dd8580c29c86394119768e3a5529850b4b859
2016-02-22 13:02:02 +09:00
Erik Kline
d0e843b8ef Support setting TCP buffer sizes and HTTP Proxy config
This allows IpManager to send callback recipients a more satisfying
LinkProperties.

Bug: 26991160
Change-Id: I2eb60dc633e5be38dad9410a1096d0095ddf57a0
2016-02-22 12:50:44 +09:00
Lorenzo Colitti
f979012c9b Add a unit test for MessageUtils.
Also fix a couple of issues in the code:

1. Check that fields are static before attempting to read them.
   Currently, if a non-static field's name starts with one of the
   specified constant prefixes (by default, "CMD_" and "EVENT_")
   we'd get an NPE.
2. Only read final fields.

Change-Id: I0e07c4c27a66180cbaf7f2b1c235daafc080863b
2016-02-20 23:24:25 +09:00
Glen Kuhne
70fc162330 Merge "Add EID_TIM to ScanResult.InformationElement" into mm-wireless-dev 2016-02-19 21:35:10 +00:00
Glen Kuhne
b6cd6fa5a7 Add EID_TIM to ScanResult.InformationElement
Added EID_TIM to enable parsing of TrafficIndicationMap
InformationElements.

BUG=25691077
Change-Id: I99450f0b720175660486da15d6b13affbdb61adc
2016-02-19 10:54:51 -08:00
Mitchell Wills
3ca1ccb419 Merge "Fix FastXmlSerializerTest" into mm-wireless-dev 2016-02-19 18:13:58 +00:00
Mitchell Wills
acd97e2e0f Merge "Remove AsyncChannelTest because it does not test anything" into mm-wireless-dev 2016-02-19 18:11:20 +00:00
Mitchell Wills
9272fd8f4c Merge "DO NOT MERGE Disable failing test case" into mm-wireless-dev 2016-02-19 18:10:54 +00:00
Roshan Pius
13f378e738 Modify the wake reasons data structure(2/2)
Changes in the android framework to use the modifed HAL API to
fetch the host wakeup reasons from the driver.

BUG: 26902794

Change-Id: I4df53c00b6b4ffd9f9ddb45577f6bccf150c43e4
2016-02-19 08:15:45 -08: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
Wei Wang
0db6066c7b Merge "Add Java API for secure RTT protocol." into mm-wireless-dev 2016-02-19 09:22:44 +00:00
Wei Wang
3cf4da9886 Disallow duplicate listeners for WifiScanner.
Bug:26663377

Change-Id: I2eea0fd3532c45f493aad7c0d5c28bda07f5bfed
2016-02-19 01:12:34 -08: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
5947d11119 Merge "Move tests for com.android.internal.util out of coretests" into mm-wireless-dev 2016-02-19 06:04:25 +00:00
Lorenzo Colitti
35402eb8ae Move tests for com.android.internal.util out of coretests
These are very simple tests with no dependencies, and moving them
out of FrameworksCoreTests makes it possible to iterate much more
quickly.  "runtest frameworks-core" takes almost a minute just to
push to the device, before any tests even start running.

Bug: 25691379
Change-Id: I8d99316a5940e0171883b97c578f9a6882b699a0
2016-02-19 14:35:48 +09:00
Mitchell Wills
019fb9f4e4 Merge "DO NOT MERGE Add a new WakeupMessage class" into mm-wireless-dev 2016-02-19 05:33:36 +00:00
Lorenzo Colitti
e9ae977322 DO NOT MERGE Add a new WakeupMessage class
This is useful when using the new AlarmManager direct callback
interface to wake up the system and request that an object whose
API consists of messages (such as a StateMachine) perform some
action.

In this situation, using AlarmManager.onAlarmListener by itself
will wake up the system to send the message, but does not
guarantee that the system will be awake until the target object
has processed it. This is because as soon as the onAlarmListener
sends the message and returns, the system is free to go to sleep
again.

Bug: 20157436
Bug: 25823676
Cherry-picked WakeupMessage.java from 9d3aadb24778cc36a350a04b088d2ed7ee3790e1
Change-Id: Idff20029d287f26347441a2523b7fb20eda6a8b0
2016-02-18 18:02:14 -08:00
Lorenzo Colitti
d2457a3ee3 Add a MessageUtils class to convert int constants to strings.
This class uses reflection to find accessible static integer
members in a specified list of classes and returns a SparseArray
mapping the integers to their names. This will allow us to
replace various 400-line switch statements with a simple
array access.

Change-Id: I3607e6389a423cde0bd83270c00b3c863ae1bb29
2016-02-19 10:26:55 +09:00
Etan Cohen
0d0f0c7faf [NAN] Renamed listeners to callback per API guidelines [DO NOT MERGE]
The interfaces had multiple functions and are hence callback
and not a listener.

Note: purely a rename operation.

Bug: 27122760
Change-Id: Ib12711f56a64052455843859125d72268c465fc0
2016-02-18 23:48:59 +00:00
Etan Cohen
e4c50de752 [NAN]: API update - consolidate Puslish|Subscribe Data+Subscribe -> Config [DO NOT MERGE]
Simplify configuration and consolidate structures whose difference
wasn't very clear.

Bug: 27122760
Change-Id: I0651cade71eb146d9ea9219baf6d2253588db3de
2016-02-18 23:46:01 +00:00
Wei Wang
71210b1022 Add Java API for secure RTT protocol.
Change-Id: I1c012f9e92e8b2af332524363f8f0c9921bf4bb5
2016-02-18 13:07:43 -08:00
Etan Cohen
aa36f07194 NAN: Support multiple instantiation per UID - introduce a client ID. [DO NOT MERGE]
Add the concept of a client ID which is used to identify a specific
(one of several) clients in all API calls.

Bug: 26962024
Change-Id: I43f13d51bee8b57c6d0ba1174168288b8d6c21c5
2016-02-18 20:57:44 +00:00