summaryrefslogtreecommitdiffstats
path: root/service
Commit message (Collapse)AuthorAgeFilesLines
...
* | EAP: Make the state-machine MSIM-awareRicardo Cerqueira2016-04-051-6/+42
| | | | | | | | | | | | | | | | | | We already get and store the SIM slot to which we want to bind an access point in Settings and the base framework. Close the loop here, and make sure the calls into Telephony refer to the correct subscription. Change-Id: I7f45b2948df08d0e158cea4e51144e5efc02dffc
* | eap-sim: Unbreak the standard non-proxied flow for multi-challenge requestsRicardo Cerqueira2016-04-041-3/+4
| | | | | | | | | | | | | | | | | | | | Change I8eb8edde7a8bb310d73d1b3cc8bc060647e2375f is intended to deal with breakage when getting an invalid reply from the RIL for SIM authentication. Unfortunately, it also breaks the loop and returns the value at the first successful reply, instead of concatenating all the challenge replies like wpa_supplicant expects it to. Change-Id: I7d1007a55e6dc5ee0dca48e16952e34562b1ff24
* | WifiScanningService: Fix invalid offset errorLegrand Benjamin2016-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code currently assumes that mSettings.buckets is at least as large as mTimeBuckets. The length of mSettings.buckets is determined at runtime by querying the kernel via the WiFi HAL. In the event that the query fails, the mSettings.buckets array will have a zero size. The code will then try to access a nonexistent element in the zero length array, leading to an array bounds error that brings down the whole Android runtime. This check protects against the crash that would occur when the mSettings.buckets array is undersized. Change-Id: Ic3fffd82c745922bd6378062ee188841880895a2
* | Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-105-68/+290
|\ \ | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/opt/net/wifi into dr15 Android 6.0.1 release 22 Change-Id: I3feacc91c693dba8f11bdc6513f204c9d47f2d18
| * | Allow turning off Wi-Fi when emergency call is made [DO NOT MERGE]Vinit Deshpande2016-01-132-17/+70
| | | | | | | | | | | | | | | | | | Bug: 24147407 Change-Id: I52db1b34df318d0754b1c316806712a61fc3a1f5
| * | Guard against HAL returning null scan resultsVinit Deshpande2016-01-121-2/+7
| | | | | | | | | | | | | | | Bug: 26374148 Change-Id: I3355f969f237fd4ba50e980f83bcbcacc7e55c84
| * | Reset idenitities for EAP-SIM networks when SIM is pulledVinit Deshpande2016-01-123-0/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change resets identity and anonymous_identity for all networks that use SIM based auth. This ensures that all cached data is destroyed when SIM is removed; and newly added SIM must be authorized on the network to connect again. Bug: 23703716 Change-Id: I83d80336b2089c73d99214651b64b79443faf7f7
| * | Appropriately fail EAP-SIM/AKA when SIM doesn't generate good responseVinit Deshpande2016-01-122-8/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change instructs supplicant to terminate the eapol when bad reponses are obtained from call to getIccSimChallengeResponse; it ensures that the failed connections terminate early and connection times are reduced. Bug: 23703236 Change-Id: I8eb8edde7a8bb310d73d1b3cc8bc060647e2375f
| * | Fix issue with WiFi scan reportingAdam Lesinski2015-12-151-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Need to assign the overridden WorkSource to the member mScanWorkSource in order to properly finish the scan. Bug:23868900 Change-Id: Iac13583bd1ecf65513a7e655b46f6e19e588a99d (cherry picked from commit 60e5908f0df75b9fda15c325f279381783b5d07d)
| * | WiFi not connecting to WiFi when screen OFFxinhe2015-11-302-8/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When framework toggle PNO too frequently, the lower layer (supplicant and driver) can have some corner case errors. Add minimum gap (5s) between two PNO toggle. Bug: 24777453 Change-Id: Ic360b753c65b77831dc8395834b9ac125f1aa7a1
| * | Don\'t set RSSI to -1 when no value is returnedMitchell Wills2015-10-291-9/+8
| |\| | | | | | | | | | | | | | | | | | | am: 78ca9b3d6f * commit '78ca9b3d6fb28abc6d52a31791f4b4084af76e65': Don't set RSSI to -1 when no value is returned
| * | Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into ↵xin He2015-10-231-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev am: b5cef8e440 * commit 'b5cef8e440ee5b054d8b38103aa2d6989c7361ef': [DO NOT MERGE] Fix build breakage introduced by CL 797896
| * \ \ Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-devxin He2015-10-233-4/+51
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e8e62c91f8 * commit 'e8e62c91f883eff9d0d0729b4bf5ffd6007a9ae4': [DO NOT MERGE] EAP-TLS PMKID mismatch error
| * \ \ \ Merge "Disable Portable Wi-Fi hotspot in ECM" into mnc-dr-devPavel Zhamaitsiak2015-10-201-0/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2fd94d6887 * commit '2fd94d6887868f769adc237fd5b9190e3a3569d3': Disable Portable Wi-Fi hotspot in ECM
| * \ \ \ \ am 35f3b9ce: Merge "Fix foreground scans for pre-M apps when location is ↵Fyodor Kupolov2015-10-161-11/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled" into mnc-dr-dev * commit '35f3b9ce41b43de59487b3231aedc64d735593a8': Fix foreground scans for pre-M apps when location is disabled
| * \ \ \ \ \ am f2e7f4fa: Merge "Security Vulnerability in android::onPnoNetworkFound" ↵xin He2015-10-162-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit 'f2e7f4fa1ac1481cdbc7bf3296321ac0fa159cc6': Security Vulnerability in android::onPnoNetworkFound
| * \ \ \ \ \ \ am a8ed84c5: DO NOT MERGE Make sure wifi driver is actually turned off when ↵Mitchell Wills2015-10-161-3/+4
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requested * commit 'a8ed84c590e48ce3e5b31b2f3d0ddd53a22b6a65': DO NOT MERGE Make sure wifi driver is actually turned off when requested
| * \ \ \ \ \ \ \ am 4a7d3850: Merge "Prevent corruption of Wifi scan battery stats" into ↵Mitchell Wills2015-10-151-1/+4
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '4a7d385069e9e1a490d6d2a8427536e1506a5801': Prevent corruption of Wifi scan battery stats
| * \ \ \ \ \ \ \ \ am e2ba917b: Merge "Do not throw an exception if appop\'s result is ↵Fyodor Kupolov2015-10-151-12/+7
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MODE_IGNORED" into mnc-dr-dev * commit 'e2ba917b13c0271e018457917a6388a2f84e20ab': Do not throw an exception if appop's result is MODE_IGNORED
| * \ \ \ \ \ \ \ \ \ am 7b97c836: Merge "Set hs20 property to 1 when connecting to passpoint ↵Pankaj Kanwar2015-10-152-0/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | network" into mnc-dr-dev * commit '7b97c836ad5ef97635329d09f7772f845713aea6': Set hs20 property to 1 when connecting to passpoint network
| * \ \ \ \ \ \ \ \ \ \ am 12a1007d: Merge "Fix center frequency parsing bug." into mnc-dr-devPankaj Kanwar2015-10-151-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '12a1007dc04897e000f91ae43f9ca90cd7441f9d': Fix center frequency parsing bug.
| * \ \ \ \ \ \ \ \ \ \ \ am d3ae426c: When entering disconnected state imediatly start a scanMitchell Wills2015-10-131-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd3ae426c1b298f038b34171d13d710524779074e': When entering disconnected state imediatly start a scan
| * \ \ \ \ \ \ \ \ \ \ \ \ am a7d7d91e: Merge "Handle supplicant state changes in non-ConnectModeState" ↵Pankaj Kanwar2015-10-121-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit 'a7d7d91ebbeb326d9d41e05768aa5f5667e68106': Handle supplicant state changes in non-ConnectModeState
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d88025b: Merge "Don\'t hold on to last scan results if scan is empty" ↵Mitchell Wills2015-10-111-29/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit '6d88025b66d5407bf132f23a7a6cc3fd97f0632b': Don't hold on to last scan results if scan is empty
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cacdd4fc: Merge "Fix mismatched buffer size in supplicant and WifiNative" ↵Vinit Deshpande2015-10-071-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit 'cacdd4fc3f67da6812dc0d0ecab487e626e49cfa': Fix mismatched buffer size in supplicant and WifiNative
| * | | | | | | | | | | | | | | | Avoid calling Class#getSimpleName from WifiStateMachine when not necessary.Erik Wolsheimer2015-10-021-30/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 24507822 Change-Id: I7debe415186d6cfb9404ac9ccf309fa1cbd78579
* | | | | | | | | | | | | | | | | wifi: Fix for re-association failure (auto join)Ravi Joshi2016-02-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getNetID function may return INVALID_NETWORK_ID, however that need not stop the auto join procedure. Change-Id: Ib3d18c1662d7204ec76b07e69d932e288ea615d5 CRs-Fixed: 934125
* | | | | | | | | | | | | | | | | wifi: Handle the NULL check for the STATUS commandc_rrajiv2016-02-121-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STATUS command is issued to the supplicant to get the currently connected network status. The current code does not consider the failure scenario (NULL check) for the obtained response and this commit handles the same. Change-Id: I4d90386bf8d909c97cacdf5b9c80e07a679d63ee CRs-Fixed: 930365
* | | | | | | | | | | | | | | | | Merge "Kill wpa_supplicant before load driver" into cm-13.0Ethan Chen2016-02-031-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Kill wpa_supplicant before load driverKeith Mok2016-02-021-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When system_server restarts due to crash, the start sequence for wifi is as follows: 1.) unload wifi driver 2.) load wifi driver 3.) kill wpa_supplicant that was left 4.) start new wpa_supplicant The problem is that when we load the wifi driver, the old wpa_supplicant will be notified immediatedly due to netlink, and tries to bring up the interface This is unnecessary. We should kill wpa_supplicant before loading wifi driver to avoid unnecessary bring up of interface by old wpa_supplicant and possibly race condition in kernel driver. Change-Id: Ie39c9b847d811e09c55386c1c4cf5f554af05868
* | | | | | | | | | | | | | | | | | Tethering: Turn off Wi-Fi Hotspot after inactivity (2/3)d34d2016-01-291-0/+6
|/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn off the Wi-Fi hotspot after a specified time of inactivity. The hotspot is considered to be inactive when no clients are connected to it. Change-Id: Ifebce027b596828b33587fafa13ca0427cdd9e31
* | | | | | | | | | | | | | | | | Use def_wifi_idle_ms to fetch WIFI_IDLE_MS defaultsDanesh M2016-01-111-10/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I060f2bb4611a2fc1576fd619acc6c87c784b4abf (cherry picked from commit 1e35a44465528dd552f8907be75d7dbc0d18e96a)
* | | | | | | | | | | | | | | | | Regional: Customize wifi hotspot and wifi namekaiyiz2015-12-222-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Set WLAN hotspot's default security type to none. -Customize hotspot ssid and pass. -Customize wifi direct name for carrier. Change-Id: If1613a8556908f372a70fbd859fa35e9315f9613 (cherry picked from commit 6b1264084e759599f6e07fc5c2b6595b6f6fe495)
* | | | | | | | | | | | | | | | | Merge branch 'LA.BF64.1.2.2_rb4.10' of ↵Steve Kondik2015-12-161-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://codeaurora.org/platform/frameworks/opt/net/wifi into cm-13.0
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Do not add (anonymous) identity for EAP-SIM/AKA/AKA` networks."Linux Build Service Account2015-12-031-0/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Do not add (anonymous) identity for EAP-SIM/AKA/AKA` networks.Sravanthi Palakonda2015-11-241-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improper identity configuration by the user while attempting to modify a network from other EAP types to EAP-SIM/AKA/AKA' results in a failed authentication. EAP-SIM/AKA/AKA' authentication mechanisms shall get the identity from either the telephony manager or the Modem ( EAP-PROXY), if the identity is not configured by the user. Thus , do not configure the identity for such networks. Change-Id: Iceda2323189c7a159de3f0b5d1df6931801a4040 CRs-Fixed: 941567
* | | | | | | | | | | | | | | | | | | wifi: Configure additional TCP parametersSteve Kondik2015-12-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Improves WiFi display / casting performance Change-Id: I728ba47be9795c979380160d1b145d8cd9a1e9b4
* | | | | | | | | | | | | | | | | | | Merge branch 'LA.BF64.1.2.2_rb4.9' of ↵Steve Kondik2015-12-082-5/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://codeaurora.org/platform/frameworks/opt/net/wifi into cm-13.0
| * | | | | | | | | | | | | | | | | | Check ecbm_mode_change param while processing ECBM intentSravanthi Palakonda2015-11-231-5/+5
| |/ / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit Ib1eb4bf03262158f805ffac959f8f9b12b80e659 does not add the action ACTION_EMERGENCY_CALLBACK_MODE_CHANGED when config_wifi_ecbm_mode_change is set to FALSE . This configuration parameter is set to FALSE for a specific MCC-MNC combination and at this point of time these parameters (MCC/MNC) from the SIM are not read and thus the configuration parameter check is of no use here. Thus , check for this configuration parameter while processing the intent . CRs-Fixed: 941367 Change-Id: I2fb29f2460c0934a3ed66bbb84bb677c3182121b
| * | | | | | | | | | | | | | | | | Wi-Fi: Inform operating band change information to AutoJoinNalla Kartheek2015-11-181-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If operating frequency band is changed in Wi-Fi turn off state, auto join controller not aware of this change. Hence inform auto join controller for the same. Change-Id: I9a370579a944294bf58ffe9907160d59bc809d20 CRs-Fixed: 940239
* | | | | | | | | | | | | | | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-076-58/+121
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/opt/net/wifi into base Android 6.0.1 release 3 Change-Id: I81ecfc8e6509fe6d76a0d5fd0bfaa3dcc11c3a08
| * | | | | | | | | | | | | | | | | Don't set RSSI to -1 when no value is returnedMitchell Wills2015-10-281-9/+8
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19928834 Change-Id: I25eebee0dcd01f7e8ea2791ccdcc75cd1066f3c0
| * | | | | | | | | | | | | | | | Merge "[DO NOT MERGE] Fix build breakage introduced by CL 797896" into ↵xin He2015-10-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | | | | | | | | | | [DO NOT MERGE] Fix build breakage introduced by CL 797896xinhe2015-10-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8ba0ca94c814e833816cab17ae328a95823512fd
| * | | | | | | | | | | | | | | | Merge "[DO NOT MERGE] EAP-TLS PMKID mismatch error" into mnc-dr-devxin He2015-10-233-4/+51
| |\| | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | [DO NOT MERGE] EAP-TLS PMKID mismatch errorxinhe2015-10-233-4/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/24253154 Change-Id: I992a99d46f94e72564d8d1a2c357f6ff1c53a11d
| * | | | | | | | | | | | | | | Disable Portable Wi-Fi hotspot in ECMPavel Zhamaitsiak2015-10-201-0/+7
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 24147407 Change-Id: I254f6f70375774ea9de51be369f6b17437ba20ef
| * | | | | | | | | | | | | | Merge "Fix foreground scans for pre-M apps when location is disabled" into ↵Fyodor Kupolov2015-10-161-11/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev
| | * | | | | | | | | | | | | Fix foreground scans for pre-M apps when location is disabledFyodor Kupolov2015-10-151-11/+18
| | | |_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wi-Fi scans should be enabled for legacy foreground apps when location is disabled. Bug: 23081999 Change-Id: I09ff32ab9845e989ed292824b7aee84d10d260cf
| * | | | | | | | | | | | | Merge "Security Vulnerability in android::onPnoNetworkFound" into mnc-dr-devxin He2015-10-162-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |