summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2Dan Pasanen2017-04-0514-76/+1064
|\ | | | | | | | | | | Android 7.1.2 Release 2 (N2G47E) Change-Id: Id7bfdf0f54f9f0a7f149b8a1f6f62fe4b791e021
| * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-190-0/+0
| |\
| | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-150-0/+0
| | |\
| | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-120-0/+0
| | | |\
| | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-110-0/+0
| | | | |\
| | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-080-0/+0
| | | | | |\
| | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-050-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2017-01-040-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2016-12-250-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2016-12-210-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2016-12-180-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2016-12-140-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in nyc-mr2-release history after reset to nyc-mr2-devgitbuildkicker2016-12-080-0/+0
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * DO NOT MERGE: WifiConfigStore: Remove config validity checkRoshan Pius2016-12-071-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added as a part of https://partner-android-review.googlesource.com/#/c/216033/. Its not clear why this is needed since this validity method was intended to be used only for network configurations received from WifiManager API's. Bug:33399220 Test: Manual tests Change-Id: Ie5bbb3ea5d97e45950e5cb374af402c2b8b9716f (cherry picked from commit ef31a2f1ce9d98e55641c8529aec14b9df0eed5b)
| * | | | | | | | | | | | | DO NOT MERGE: Fix to enable reconnecting to a Carrier network.pkanwar2017-01-182-17/+36
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now generate a new Config for each connection attempt. BUG: 30760683 Change-Id: I88393ecc2964e299e80f6f2802dd85a142e1f473
| * / / / / / / / / / / / DO NOT MERGE: Fix to maintain the Carrier Network connection.pkanwar2017-01-124-4/+11
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isCarrierNetwork param in WifiConfiguration, which is then used in WifiStateMachine. After this change, the connection to Carrier Network should be maintained. BUG: 30760683 Change-Id: Ie6df849182aafc018e336631c502ff7749bfdc35
| * | | | | | | | | | | Merge "[DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggle" into ↵Rebecca Silberstein2017-01-112-8/+18
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr2-dev
| | * | | | | | | | | | | [DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggleRebecca Silberstein2017-01-042-8/+18
| | | |_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The icon for wifi toggles on/off quickly when transitioning between states if location scans are enabled. This is due to two errors: 1 - WifiStateMachine sends the wifi enabled broadcast before wifi has entered client mode. 2 - WifiStateMachine assumes it is entering client mode if it has not been told otherwise. This CL works around the assumptions in WifiStateMachine and avoids sending the wifi enabled broadcast when it should be going in to scan mode and not client mode. Bug: 28336982 Test: verified state transitions manually Test: runtest frameworks-wifi Change-Id: I5e34ee4f0ef90668ecc97f5d6d726444fd08ffb3
| * | | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in ↵Roshan Pius2017-01-111-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | WifiConfiguration" into nyc-mr2-dev
| | * | | | | | | | | | DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfigurationRoshan Pius2017-01-101-0/+9
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FT flags are added dynamically to wpa_supplicant. These are not exposed in the public API's and hence should not be returned in the configs retrieved by apps. So, strip out the FT flags when reading network configuration from wpa_supplicant. Bug: 34095472 Test: Will send for regression testing. Change-Id: I0d49fb3c98e49207f2faf30d54493f1147924e3b
| * / | | | | | | | | DO NOT MERGE ANYWHERE: Connect to Carrier networks if enabled inpkanwar2017-01-103-1/+45
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings. After this change the WifiQualifiedSelector will only connect to Carrier networks if enabled in the Settings. Provided a method in WifiConfigManager that will be used to decide if we try connecing to the Carrier network. BUG: 30760683 Change-Id: I5c6841f784bd82f3811837331d3dd0c795da7688
| * / / / / / / / / DO NOT MERGE: Fix null dereference in carrier networksPaul Stewart2017-01-051-1/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiStateMachine can respond to CMD_HAS_CARRIER_CONFIGURED_NETWORKS with a null object if it is not in a state to handle this. Therefore syncHasCarrierConfiguredNetworks must check for null before attempting to cast the result object back to boolean. Bug: 34050164 Test: Compile Change-Id: I21b80ef3989ca2d6a09784f9c9a44f4af19b5850
| * | | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: ↵Peter Qiu2017-01-041-10/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd91d4a476 am: 39ec37cefe am: e4890ae5f6 Change-Id: Ib39ff0bf19dd2a0390cee7c371167d9db3bda487
| | * | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476Peter Qiu2017-01-041-10/+0
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 39ec37cefe Change-Id: I82862cd9b911f3de01ce97be4dcb225259e72a74
| | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1aPeter Qiu2017-01-041-10/+0
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: bd91d4a476 Change-Id: I8afeca7863e3973205272eabc7df7d8b4f2d3cf7
| | | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f35c310b1a Change-Id: Ie8d68a8964d49b629e37d79dd14dac7e523f1461
| | | | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9845a6826188ea0c05508947f5c1266a245b04fd
| | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration file am: de3de10eec am: ↵Peter Qiu2017-01-041-6/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d43428276 am: 39ae399af7 Change-Id: Ice3c49e6f2377f2822cce0fe1138f5c837507d1b
| | | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration file am: de3de10eecPeter Qiu2017-01-041-6/+0
| | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 8d43428276 Change-Id: I2fdc59cf23a122bcc6cbc4f0596e384152d29160
| | | | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration filePeter Qiu2017-01-041-6/+0
| | | | | | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: de3de10eec Change-Id: I04ebda0dccafa98a4b08d35cddc17d005f6a735f
| | | | | | | | | * | | | | | | configparse: do not delete passpoint configuration filePeter Qiu2016-12-121-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is the caller's responsibility for deleting configuration files. This avoids the ConfigBuilder from deleting arbitrary files (specified by URI) pass-in by the callers. Bug: 33178389 Test: Verify Passpoint Configuration installation works using Shamu Change-Id: I54803dc711ede98a1ec1259077522032c543dca1
| * | | | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi.Ivan Podogov2017-01-031-13/+10
| |\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 054ddcd931 Change-Id: Id40da72090217210ac0ffbc1029475a8ef0ee2da
| | * | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi.Ivan Podogov2016-12-161-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 33155556 Change-Id: I41d9adb916c12327643d59fd05a50d097800e2ac
| * | | | | | | | | | | | | | Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-devPankaj Kanwar2016-12-224-0/+71
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | DO NOT MERGE: Add API to indicate carrier networks.pkanwar2016-12-214-0/+71
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 31003437 Change-Id: I4a5374b59d08fd8ec8ffbff007764e3f277f79df
| * | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM." into nyc-mr2-devPankaj Kanwar2016-12-211-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM.pkanwar2016-12-211-2/+4
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WifiStateMachine was not looking for the right keys. Add condition to look for WPA_EAP, in addition to IEEE8021X. Bug:31003437 Change-Id: Icc72644de77927a23c2ad5a4fbea640ba392e9ae
| * / | | | | | | | | | | | DO NOT MERGE: Allow Carriers to specify Wifi Networks.pkanwar2016-12-193-132/+296
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for Carrier networks. Added functionality to read Carrier networks from Carrier Config. Bug: 31003437 Test: Added new tests, regression tests passed (frameworks-wifi). Change-Id: I9c3c03e2ab4a459898bec125f9dea8f96977e04f
| * | | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO listRoshan Pius2016-12-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3fb2033532 Change-Id: I85c068eef7c5da177b9a93a441b5a4882e113912
| | * | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO listRoshan Pius2016-12-152-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These networks are not connectable even if they're detected by PNO scans. So, ignore them in the PNO list. Bug: 33055484 Bug: 33606172 Test: Integration tests Change-Id: I3a33e0444639969195506321f630430520bbfcd5 (cherry picked from commit eb77c40b3d17153fe91ca1691aaf2ad16f3f7267)
| * | | | | | | | | | | | Merge "Send CMD_DISCONNECT after removing app/user configs DO NOT MERGE" ↵Robin Lee2016-12-152-27/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | into nyc-mr2-dev
| | * | | | | | | | | | | Send CMD_DISCONNECT after removing app/user configs DO NOT MERGERobin Lee2016-12-092-27/+45
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise they might linger in wpa_supplicant longer than they were supposed to. This is already done by every other callsite for removing networks which might still be in use. Test: runtest -x tests/wifitests/src/com/android/server/wifi/WifiConfigManagerTest.java Bug: 32660379 Change-Id: I45b0bcc87129be02bcce940f07f7c48543207bf0 (cherry-picked from commit 1fe1065da82165183fa057ddbbd2e33bc5708c1b)
| * | | | | | | | | | | Merge "DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM" into ↵TreeHugger Robot2016-12-131-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr2-dev
| | * | | | | | | | | | | DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAMRoshan Pius2016-12-131-0/+4
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The crash reported by the user seems to have occured as the user was turning off/on wifi. The networkID selected by WifiConnectivityManager may be invalid by the time this message is processed by WifiStateMachine. So, add an explicit null check to abort the roam request. Bug: 33106930 Test: Will send for regression tests. Change-Id: I992a35e099d7af922da046107fa8e41052b5d2c1
| * | | | | | | | | | | Add WiFi toggle prompts - wifiSvetoslav Ganov2016-12-131-4/+73
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | am: 989265e3f6 Change-Id: I0d14152af46887794ec59f6b9d56d5214277a38d
| | * | | | | | | | | Add WiFi toggle prompts - wifiSvetoslav Ganov2016-12-051-4/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If permission review is enabled toggling WiFi on or off results in a user prompt to collect a consent. This applies only to legacy apps, i.e. ones that don't support runtime permissions as they target SDK 22. bug:28715749 Change-Id: Ie60ae91bd8e9c67a3e14a2820055234f669df1df
| * | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Remove config validity check" into ↵Roshan Pius2016-12-071-7/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nyc-mr2-dev
| | * | | | | | | | | | DO NOT MERGE: WifiConfigStore: Remove config validity checkRoshan Pius2016-12-071-7/+0
| | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added as a part of https://partner-android-review.googlesource.com/#/c/216033/. Its not clear why this is needed since this validity method was intended to be used only for network configurations received from WifiManager API's. Bug:33399220 Test: Manual tests Change-Id: Ie5bbb3ea5d97e45950e5cb374af402c2b8b9716f
| * | | | | | | | | | Merge "DO NOT MERGE: Allow Carriers to specify Wifi Networks." into nyc-mr2-devPankaj Kanwar2016-12-072-4/+349
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | DO NOT MERGE: Allow Carriers to specify Wifi Networks.pkanwar2016-12-062-4/+349
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new evaulator for Carrier networks. Added functionality to read Carrier networks from Carrier Config. Bug: 31003437 Test: Added new tests, regression tests passed (frameworks-wifi)Allow Carriers to specify Wifi Networks. Change-Id: I226fb716a2a2883a8b2630c0d4e8cd51636b1089
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 10:08:16 +0000