217602 Commits

Author SHA1 Message Date
Erik Kline
ca4c61aa9f Add Protocol.BASE_ETHERNET
Change-Id: I4e51370c0b53d9902eea8aae409f9f7cffaf28ad
2016-02-18 18:15:52 +09:00
Erik Kline
efa4209fe0 {,Base}DhcpStateMachine is no more
Bug: 26991160
Change-Id: I21f8c30627bf2a7fbcd5b4d5f1f1ad1a2dda759b
2016-02-18 12:56:45 +09:00
Shishir Agrawal
6eef1df380 DO NOT MERGE: Add subscription specific TelephonyManager calls.
SubId specific version of the following functions are being added.
  - hasCarrierPrivileges
  - iccCloseLogicalChannel
  - iccExchangeSimIO
  - iccOpenLogicalChannel
  - iccTransmitApduBasicChannel
  - iccTransmitApduLogicalChannel
  - sendEnvelopeWithStatus
  - setOperatorBrandOverride
  - setPreferredNetworkTypeToGlobal

Bug: 26772894

Change-Id: I8c9e6d9bfe73f530e6f91c86211103fdfb1520bf
2016-02-17 14:44:09 -08:00
Mitchell Wills
07e27b7541 Merge "Remove REPORT_EVENT_CONTEXT_HUB gscan option" into mm-wireless-dev 2016-02-17 20:30:56 +00:00
Erik Kline
29a215268d Remove references to BaseDhcpStateMachine and DhcpStateMachine
Bug: 26991160
Change-Id: I3742780a4e5121c163d9d1380951e25edaba19f3
2016-02-17 21:44:25 +09:00
Erik Kline
b1ee39540e Add IpManager#shutdown() to terminate the state machine.
Additionally, remove IpManager.Callback#usingIpReachabilityMonitor()
now that this is now longer used.

Bug: 26991160
Change-Id: I9a17497c82238a9fb37a20d01aeca7bc4913ae2c
2016-02-17 20:54:10 +09:00
Nathan Harold
e629c06730 Merge "Create BandMode Constants" into mm-wireless-dev 2016-02-17 00:44:13 +00:00
Peter Qiu
03d7581cf6 Merge "WifiConfiguration: add constants for radio band" into mm-wireless-dev 2016-02-16 18:04:14 +00:00
Erik Kline
93b1a36e31 Add IpManager.ProvisioningRequest class
This class captures provisioning request parameters to be passed to
IpManager#startProvisioning().

Bug: 26991160
Change-Id: I56652bbc4b9ae6cfca3f225a8d99cdfc01bb54d9
2016-02-16 18:11:47 +09:00
Bartosz Fabianowski
e1bdbd216f Merge "Remove wifiConfiguration.isVisibleToUser()" into mm-wireless-dev 2016-02-15 09:56:53 +00:00
pkanwar
06727c2f18 Changing string in notification when data is blocked.
b/25209821

Change-Id: Iaedc7315fd95a7b9a173a4101865ff5047417ed5
2016-02-12 16:18:43 -08:00
Nathan Harold
aa0f5873a7 Create BandMode Constants
Bug: 27145805
Change-Id: I733026268600f504325bc92061ee830d1448bbf5
2016-02-12 13:38:53 -08:00
Peter Qiu
d667616659 WifiConfiguration: add constants for radio band
Change-Id: I2287ffb3d93351d73659327cef37a6d3ecd588b3
2016-02-12 08:50:05 -08:00
Paul Stewart
323561773f Merge "Revert "Properly map EAP-GTC for TTLS"" into mm-wireless-dev 2016-02-12 16:23:43 +00:00
Paul Stewart
d3be75fd4b Revert "Properly map EAP-GTC for TTLS"
This reverts commit be5084b87aa6a5e97becac6a43b448fee34196c2.

Reverting to re-land after test team does their thing

Change-Id: Ia236b77f08d15f47efb5469478000ded3b0d7954
2016-02-12 16:21:01 +00:00
Paul Stewart
724ea69e4b Merge "Properly map EAP-GTC for TTLS" into mm-wireless-dev 2016-02-12 16:07:19 +00:00
Bartosz Fabianowski
00144e8de3 Remove wifiConfiguration.isVisibleToUser()
This method seemed like a good idea at the time (quickly check whether a
network configuration is visible to a given user). However, once managed
profiles come into play, this simple method is no longer appropriate.
There is a more comprehensive replacement at
com.android.server.wifi.WifiConfigurationUtil.isVisibleToAnyProfile()
now and this method here can go.

BUG:26867426

Change-Id: Ia66aa6f74003a16eca24c5088d3aba8e0c9f8140
2016-02-12 11:12:45 +01:00
Erik Kline
3b74289fdf Duplicate DhcpStateMachine public constants into DhcpClient
This is so we can ultimately delete DhcpStateMachine altogether.

Bug: 24837343
Bug: 26991160
Change-Id: If116639e5f72c97cfc67f748dc5f6433dccd9cf0
2016-02-12 17:10:15 +09:00
Tyler Gunn
989594638a Merge "IMS RAT Reporting in Registration Unsol" into mm-wireless-dev 2016-02-12 03:40:08 +00:00
Omkar Kolangade
d4e44bbdbf IMS RAT Reporting in Registration Unsol
Adding a parameter to the IMS registration complete
and progressing callbacks, allowing frameworks to be
notified of the radio access technology over which
IMS is registered.

Bug: 21902225
Change-Id: I271f2fca299585302a67d0f5476f6fac3e7099dd
2016-02-11 23:51:41 +00:00
Etan Cohen
7d6c389edf NAN: Disable all DBG flags.
Change-Id: Ib60cf3c9fd4c8dbf973e118d94340fbfd890a738
2016-02-11 15:00:57 -08:00
Paul Stewart
be5084b87a 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
Test:runtest frameworks-wifi # New unit test in the same topic
Test:cts-tradefed run cts -d --class android.net.wifi.cts.WifiEnterpriseConfigTest
Change-Id: I1e09fb3f1f27b2ba844acbed14ec0f570e915b80
2016-02-11 14:52:58 -08:00
Paul Stewart
4e9e3d02e0 Merge "WifiManager: Return empty scan list on remote exception" into mm-wireless-dev 2016-02-11 20:01:18 +00:00
Paul Stewart
ed9297991a WifiManager: Return empty scan list on remote exception
In the (hopefully rare) situation where there is a remote exception
from a call to getScanResults(), do not pass null back to callers.
Nobody expects this, and failures that occur as a result can distract
from the real problem (e.g., the system server crashing).  This CL
now returns an empty list.

BUG=27139097
TEST=None

Change-Id: I637eae1fa8ac1a1bc2b76dea8628359b5dec06e1
2016-02-11 11:16:17 -08:00
Jeremy Joslin
3d4acbf5fb Merge "New systemapi to mark a wifi network as metered." into mm-wireless-dev 2016-02-11 15:03:52 +00:00
Erik Kline
ef1f39abff Use IpManager.ifname as the tag in log messages.
Bug: 26991160
Change-Id: Idc9231819298b65da3cc3baa88f1f0cd18ab6df7
2016-02-11 21:07:07 +09:00
Jeremy Joslin
7a598d3d80 New systemapi to mark a wifi network as metered.
The implementation will come after the wifi code base has stablized.

BUG:27120794
Change-Id: I6a8140dae45dcd7ec70ac0c51b9513b907a41b63
2016-02-10 17:20:22 -08:00
Sanket Padawe
de0cc7f4d3 Merge "Add OEM specific error code space which can by used to replace Generic errors." into mm-wireless-dev 2016-02-11 00:04:01 +00:00
Mitchell Wills
5a982939d2 Remove REPORT_EVENT_CONTEXT_HUB gscan option
Since all scan results will now be reported to the context hub this flag
is no longer needed.

Change-Id: I21c157a31fe26169606f6f53e8e0ce44d57c5ca5
2016-02-10 14:37:27 -08:00
Erik Kline
f94dc18746 Merge "Incorporate historical WifiStateMachine notions of provisioning." into mm-wireless-dev 2016-02-10 21:15:11 +00:00
Ritesh Reddy
d9c4bc0c4d Merge "Enabled Network Policy Backup/Restore." into mm-wireless-dev 2016-02-10 19:37:17 +00:00
Erik Kline
990fc4968d Incorporate historical WifiStateMachine notions of provisioning.
Also: considerably expand logging capabilities.

Bug: 26991160
Change-Id: I36c3c1d2158ffd178e8ce163b8799d62938f39c7
2016-02-11 03:21:48 +09:00
Ritesh Reddy
c4a1188afd Merge "Enabling SoftAP Configuration Backup." into mm-wireless-dev 2016-02-10 17:48:31 +00:00
Erik Kline
106cdf6c94 Expose measurement results to interested callers.
With this it's possible for callers to:

    Network network = ...
    LinkProperties lp = ...

    NetworkDiagnostics netdiag = new NetworkDiagnostics(network, lp, 5000);
    netdiag.startMeasurements();
    netdiag.waitForMeasurements();

    boolean result = true;
    for (Measurement m : netdiag.getMeasurements()) {
        if (!m.checkSucceeded()) {
            result = false;
            // Additional error handling here.
        }
    }

    return result;

Bug: 21832299
Bug: 26780890
Change-Id: Iaf7ff029e2c6a998b574c23d0dcde8d57a467a22
2016-02-11 00:28:27 +09:00
Randy Pan
2750b41d0b Merge "Add RSN Information Element ID" into mm-wireless-dev 2016-02-09 19:13:33 +00:00
Samuel Tan
8629390701 Merge "WifiEnterpriseConfig: allow getting and setting of ca_path" into mm-wireless-dev 2016-02-09 18:18:05 +00:00
Sanket Padawe
ce4f22e84e Add OEM specific error code space which can by used to replace Generic errors.
BUG=27038563

Change-Id: I125e083e0a3145ac09806a84ea8b53864c04dc22
2016-02-09 10:02:02 -08:00
Jan Nordqvist
cf132a1bbc Merge "Fixed bad auto-generated method name." into mm-wireless-dev 2016-02-09 17:24:21 +00:00
Wei Wang
03a6b18350 Merge "Enable RTT Responder Role (1/4)." into mm-wireless-dev 2016-02-09 01:07:34 +00:00
Ritesh Reddy
adca34a0d6 Enabled Network Policy Backup/Restore.
Added Backup Restore specific NetworkPolicySerializer
to NetworkPolicy Class and related classes.

Change-Id: I2a11e2afae8dd9e0ee0c3356e669a73f6a1361af
2016-02-08 10:41:21 +00:00
Ritesh Reddy
aeb4c06013 Enabling SoftAP Configuration Backup.
SoftAp Conf is backed up as a serialized WifiConfiguration
object.

Change-Id: Ib7f4d130600313a67b710b45df274e15f0baad24
2016-02-08 10:33:13 +00:00
Paul Jensen
5f3dec374f Fix FrameworksServicesTests.apk to include libc++.so
libc++.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ide004cb84f7f50feffb8f5acb46b7001dcffd208
2016-02-07 21:58:09 -05:00
Tyler Gunn
6c4aac0bde Merge "IMS: Constants For Audio Quality, Supp. Services" into mm-wireless-dev 2016-02-05 22:13:32 +00:00
Etan Cohen
02033f800b Merge "NAN: for failed configurations - added configuration which failed." into mm-wireless-dev 2016-02-05 18:27:08 +00:00
Jan Nordqvist
afebe357fb Fixed bad auto-generated method name.
Change-Id: Ic60b0658f0b6a6e06dc9cf82299fe95bbd308972
2016-02-05 17:16:04 +00:00
Randy Pan
c0e86b2e90 Add RSN Information Element ID
Bug: 26908033
Change-Id: I9d7aa7642c51ea59a58e8facc8ad7af681c32b23
2016-02-04 14:56:13 -08:00
Paul Jensen
514a3bfde6 Fix FrameworksServicesTests.apk to include libnativehelper.so
libnativehelper.so is no longer accessible to the app, so it must be
bundled in the app. This should get ApfTest passing again.

Change-Id: Ie4fe66e44d46ddb12b3c7ac5c91118a69a8ebe2e
2016-02-04 09:11:40 -05:00
Jan Nordqvist
7a504417f2 Fixed bad serialization code in ScanResult.
Bug: 26964162
Change-Id: Ie9ad65936ab5173533773e5a711bcb81799acfb5
2016-02-03 15:00:57 -08:00
Omkar Kolangade
66742f217e IMS: Constants For Audio Quality, Supp. Services
Adding:
1. Constants for audio quality (EVS standard).
2. Service class memeber to CallForwardInfo.
3. Call Fail Cause for emergency call and handover
   scenarios, and supplementary services.

Change-Id: I7cc23acd01144def0bb725c4f6312318421027c8
2016-02-03 14:24:45 -08:00
Jan Nordqvist
fd600b1113 Merge "New System APIs for Passpoint r2 app." into mm-wireless-dev 2016-02-03 19:57:00 +00:00