summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* VenueNameElement: fix off-by-one enum bounds checkstable/cm-13.0-ZNH2KBSamuel Tan2016-10-041-4/+4
| | | | | | | | | | | | | | | | | | Fix the off-by-one error in the conditionals that check whether the Venue Group and Venue Type codes in the ANQP element are in the "Reserved" range. CYNGNOS-3286 BUG: 30169673 BUG: 29464811 TEST: Manually set up AP with Hotspot 2.0 support, broadcasting Venue Group value 0xc, and ensure that device does not crash when in range of this AP. Change-Id: I14adc3a919e19b67fc0f46bf09d0cffb88b5354e (cherry picked from commit 48ee5f1e1c6e2a2dc63e9cb84c42f532c8a6847a) (cherry picked from commit 4fe13c4c651b1873a73bc77895840561f1cb582a) (cherry picked from commit 86bdc8e5361232ce17a67a260fb58a700900c198)
* ANQPFactory: catch all potential parsing errorsSamuel Tan2016-10-041-71/+87
| | | | | | | | | | | | | | | | | | The ANQP Element parsing code that parses untrusted data broadcasted by APs is currently untested, and might contain errors that will trigger exceptions that can crash the system service (e.g. null pointer exceptions). To contain this risk, catch all possible exceptions from the invoking ANQP element parsing code from ANQPFactory, and throw them again as ProtocolExceptions, which users of ANQPFactory already catch. CYNGNOS-3286 BUG: 30230534 Change-Id: Icaba02c0e6739d94482cf4a5e704b59f8d4105b4 (cherry picked from commit 6154eb070b9f224a8daebf0a852d61f07d2c5cf3) (cherry picked from commit bafabeb09d7c75ef205a5b2fcbd581be6b6e2771) (cherry picked from commit 0378f69284723d075acb4f0ef1e4dfb5c21fc73a)
* hotspot: Add a fallback to model-name for SSIDRicardo Cerqueira2016-06-231-0/+4
| | | | | | | | Almost every configuration to overlay the device's AP SSID sets it to the model name. Just use that directly when the other options are empty, instead of copying the same string around. Change-Id: I9f6c8d0f9fe9486ce58347b46ba46f7c230910f2
* Fix EAP-SIM fallback identity generation outside of North AmericaRicardo Cerqueira2016-05-091-2/+12
| | | | | | | | | | | | | | | There are only a few MCCs in which the MNC is expected to be 3-digit long. However, the fallback path for REQ-IDENTITY was assuming that length all the time, which resulted in us getting the wrong realm for the fallback path (which is kicked in when, for example, wifi starts up faster than mobile) Also, SIM states are indexed by slot, not subId Ref CYNGNOS-2768 Change-Id: I3ea01d45e62689075b62df7a169f8734d0c9f5e6 (cherry picked from commit b354a61d44d2ff79c922ac96bbf662825f909dcd)
* Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-050-0/+0
|\ | | | | | | | | Ticket: CYNGNOS-2213 Android 6.0.1 release 24
| * merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| |\
| | * Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response"Paul Stewart2016-03-082-26/+8
| | | | | | | | | | | | This reverts commit 5ebc35f19feab2755a13cf7d5acaeff4bbc78994.
| | * Appropriately fail EAP-SIM/AKA when SIM doesn't generate good responseVinit Deshpande2016-03-022-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
| | * Revert "Appropriately fail EAP-SIM/AKA when SIM doesn't generate good response"Paul Stewart2016-03-012-26/+8
| |/ | | | | | | This reverts commit 5ebc35f19feab2755a13cf7d5acaeff4bbc78994.
* | 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 ↵staging/cm-13.0+r22Steve 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 returned am: 78ca9b3d6fMitchell Wills2015-10-291-9/+8
| |\ | | | | | | | | | | | | | | | | | | am: 06f83655f7 * commit '06f83655f769d9649cfd51fda485cd553dfca7cf': Don't set RSSI to -1 when no value is returned
| | * 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 am: 9f4c81f701 * commit '9f4c81f7018c3c8a5af1e0784b3c7d0a583ec95b': [DO NOT MERGE] Fix build breakage introduced by CL 797896
| | * | 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-dev am: ↵xin He2015-10-233-4/+51
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8e62c91f8 am: 0b14bbb35f * commit '0b14bbb35f1561e7ab529e32fe529a041610cc68': [DO NOT MERGE] EAP-TLS PMKID mismatch error
| | * | | 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-dev am: 2fd94d6887Pavel Zhamaitsiak2015-10-201-0/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 02d8a99ce6 * commit '02d8a99ce6c64e6bd4e0e15cd72efe53bf2e7b22': Disable Portable Wi-Fi hotspot in ECM
| | * | | | 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 25f32f28: am a15a2ee6: Security Vulnerability in ↵xinhe2015-10-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android::onPnoNetworkFound [DO NOT MERGE] am: 4ea1de412e * commit '25f32f285871054884e52d2a8631a80512241f8b': Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]
| | * | | | | am a15a2ee6: Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]xinhe2015-10-190-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4ea1de412e * commit '4ea1de412e8eca0a18151fa13ee3fc1e18b1358c': Security Vulnerability in android::onPnoNetworkFound [DO NOT MERGE]
| * | | | | | | am 4720b8c8: am f5535dfe: am 4436f1f2: am dcf7577b: am d32033b8: am ↵Vinit Deshpande2015-10-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b41627f: Fix a race in WifiNative objects * commit '4720b8c81c95b65b64fa7a4c4778bf7ffeb511c3': Fix a race in WifiNative objects
| | * | | | | | am f5535dfe: am 4436f1f2: am dcf7577b: am d32033b8: am 8b41627f: Fix a race ↵Vinit Deshpande2015-10-160-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in WifiNative objects * commit 'f5535dfe8442ada8c42f33a61ec0fcd448329f64': Fix a race in WifiNative objects
| * | | | | | | | am be964f00: am 35f3b9ce: Merge "Fix foreground scans for pre-M apps when ↵Fyodor Kupolov2015-10-161-11/+18
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location is disabled" into mnc-dr-dev * commit 'be964f00e71597f880c051772e8acd1a44b08e17': Fix foreground scans for pre-M apps when location is disabled
| | * | | | | | | 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 c9bea298: am f2e7f4fa: Merge "Security Vulnerability in ↵xin He2015-10-162-3/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android::onPnoNetworkFound" into mnc-dr-dev * commit 'c9bea298d4b6d4c9920914d3dc8df23e3c595700': Security Vulnerability in android::onPnoNetworkFound
| | * | | | | | | | 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 9d864238: am a8ed84c5: DO NOT MERGE Make sure wifi driver is actually ↵Mitchell Wills2015-10-161-3/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | turned off when requested * commit '9d86423893492156db7fbc1b4f94ef0517ca9220': DO NOT MERGE Make sure wifi driver is actually turned off when requested
| | * | | | | | | | | 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 680ac28c: am 4a7d3850: Merge "Prevent corruption of Wifi scan battery ↵Mitchell Wills2015-10-151-1/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats" into mnc-dr-dev * commit '680ac28ce035a3765d64dd0e747af942e4438e3c': Prevent corruption of Wifi scan battery stats
| | * | | | | | | | | | 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 d8c80cc7: am e2ba917b: Merge "Do not throw an exception if appop\'s ↵Fyodor Kupolov2015-10-151-12/+7
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | result is MODE_IGNORED" into mnc-dr-dev * commit 'd8c80cc7ff540c103e48cf298d196a6b66548134': Do not throw an exception if appop's result is MODE_IGNORED
| | * | | | | | | | | | | 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 7af1ef61: am 7b97c836: Merge "Set hs20 property to 1 when connecting to ↵Pankaj Kanwar2015-10-152-0/+10
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | passpoint network" into mnc-dr-dev * commit '7af1ef61493d25c333561071dc8bbc3da8f0a86b': Set hs20 property to 1 when connecting to passpoint network
| | * | | | | | | | | | | | 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 a29ea4f6: am 12a1007d: Merge "Fix center frequency parsing bug." into ↵Pankaj Kanwar2015-10-151-4/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit 'a29ea4f648cc12ad81bc258ad11ae3d63cd4921f': Fix center frequency parsing bug.
| | * | | | | | | | | | | | | 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 ca452804: am d3ae426c: When entering disconnected state imediatly start a ↵Mitchell Wills2015-10-131-2/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scan * commit 'ca45280461867c973acb736f6e8efe1518c03dc9': When entering disconnected state imediatly start a scan
| | * | | | | | | | | | | | | | 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 f76c13a4: am a7d7d91e: Merge "Handle supplicant state changes in ↵Pankaj Kanwar2015-10-121-0/+4
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-ConnectModeState" into mnc-dr-dev * commit 'f76c13a415da5e64aca41083b2c1642844311b3b': Handle supplicant state changes in non-ConnectModeState
| | * | | | | | | | | | | | | | | 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 082dd48c: am 6d88025b: Merge "Don\'t hold on to last scan results if scan ↵Mitchell Wills2015-10-111-29/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is empty" into mnc-dr-dev * commit '082dd48cb77c4ba0fccaa13906b32f3219184b37': Don't hold on to last scan results if scan is empty
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 04:16:56 +0000