| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag 'android-7.1.2_r2' into cm-14.1staging/cm-14.1_android-7.1.2_r2 | Dan Pasanen | 2017-04-05 | 14 | -76/+1064 |
| |\ | |||||
| | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-19 | 0 | -0/+0 |
| | |\ | |||||
| | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-15 | 0 | -0/+0 |
| | | |\ | |||||
| | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-12 | 0 | -0/+0 |
| | | | |\ | |||||
| | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-11 | 0 | -0/+0 |
| | | | | |\ | |||||
| | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-08 | 0 | -0/+0 |
| | | | | | |\ | |||||
| | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-05 | 0 | -0/+0 |
| | | | | | | |\ | |||||
| | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2017-01-04 | 0 | -0/+0 |
| | | | | | | | |\ | |||||
| | | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2016-12-25 | 0 | -0/+0 |
| | | | | | | | | |\ | |||||
| | | | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2016-12-21 | 0 | -0/+0 |
| | | | | | | | | | |\ | |||||
| | | | | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2016-12-18 | 0 | -0/+0 |
| | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2016-12-14 | 0 | -0/+0 |
| | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | * | merge in nyc-mr2-release history after reset to nyc-mr2-dev | gitbuildkicker | 2016-12-08 | 0 | -0/+0 |
| | | | | | | | | | | | | |\ | |||||
| | | | | | | | | | | | | | * | DO NOT MERGE: WifiConfigStore: Remove config validity check | Roshan Pius | 2016-12-07 | 1 | -7/+0 |
| | * | | | | | | | | | | | | | DO NOT MERGE: Fix to enable reconnecting to a Carrier network. | pkanwar | 2017-01-18 | 2 | -17/+36 |
| | |/ / / / / / / / / / / / | |||||
| | * / / / / / / / / / / / | DO NOT MERGE: Fix to maintain the Carrier Network connection. | pkanwar | 2017-01-12 | 4 | -4/+11 |
| | |/ / / / / / / / / / / | |||||
| | * | | | | | | | | | | | Merge "[DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggle" into n... | Rebecca Silberstein | 2017-01-11 | 2 | -8/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | [DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggle | Rebecca Silberstein | 2017-01-04 | 2 | -8/+18 |
| | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfiguration... | Roshan Pius | 2017-01-11 | 1 | -0/+9 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfiguration | Roshan Pius | 2017-01-10 | 1 | -0/+9 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * / | | | | | | | | | DO NOT MERGE ANYWHERE: Connect to Carrier networks if enabled in | pkanwar | 2017-01-10 | 3 | -1/+45 |
| | |/ / / / / / / / / | |||||
| | * / / / / / / / / | DO NOT MERGE: Fix null dereference in carrier networks | Paul Stewart | 2017-01-05 | 1 | -1/+1 |
| | |/ / / / / / / / | |||||
| | * | | | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476... | Peter Qiu | 2017-01-04 | 1 | -10/+0 |
| | |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| | | * | | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476 | Peter Qiu | 2017-01-04 | 1 | -10/+0 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a | Peter Qiu | 2017-01-04 | 1 | -10/+0 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | resolve merge conflicts of fe09754c1 to nyc-dev | Peter Qiu | 2017-01-04 | 1 | -10/+0 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | resolve merge conflicts of fe09754c1 to nyc-dev | Peter Qiu | 2017-01-04 | 1 | -10/+0 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ | configparse: do not delete passpoint configuration file am: de3de10eec am: 8d... | Peter Qiu | 2017-01-04 | 1 | -6/+0 |
| | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ | configparse: do not delete passpoint configuration file am: de3de10eec | Peter Qiu | 2017-01-04 | 1 | -6/+0 |
| | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ | configparse: do not delete passpoint configuration file | Peter Qiu | 2017-01-04 | 1 | -6/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | | | | * | | | | | | | configparse: do not delete passpoint configuration file | Peter Qiu | 2016-12-12 | 1 | -6/+0 |
| | * | | | | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi. | Ivan Podogov | 2017-01-03 | 1 | -13/+10 |
| | |\| | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi. | Ivan Podogov | 2016-12-16 | 1 | -13/+10 |
| | * | | | | | | | | | | | | | | Merge "DO NOT MERGE: Add API to indicate carrier networks." into nyc-mr2-dev | Pankaj Kanwar | 2016-12-22 | 4 | -0/+71 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | DO NOT MERGE: Add API to indicate carrier networks. | pkanwar | 2016-12-21 | 4 | -0/+71 |
| | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | Merge "DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM." into nyc-mr2-dev | Pankaj Kanwar | 2016-12-21 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | DO NOT MERGE: Fix bug in WifiStateMachine for EAP-SIM. | pkanwar | 2016-12-21 | 1 | -2/+4 |
| | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | |||||
| | * / | | | | | | | | | | | | DO NOT MERGE: Allow Carriers to specify Wifi Networks. | pkanwar | 2016-12-19 | 3 | -132/+296 |
| | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO list | Roshan Pius | 2016-12-15 | 0 | -0/+0 |
| | |\| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO list | Roshan Pius | 2016-12-15 | 2 | -6/+21 |
| | * | | | | | | | | | | | | Merge "Send CMD_DISCONNECT after removing app/user configs DO NOT MERGE" into... | Robin Lee | 2016-12-15 | 2 | -27/+45 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Send CMD_DISCONNECT after removing app/user configs DO NOT MERGE | Robin Lee | 2016-12-09 | 2 | -27/+45 |
| | | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge "DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM" into ... | TreeHugger Robot | 2016-12-13 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM | Roshan Pius | 2016-12-13 | 1 | -0/+4 |
| | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Add WiFi toggle prompts - wifi | Svetoslav Ganov | 2016-12-13 | 1 | -4/+73 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Add WiFi toggle prompts - wifi | Svetoslav Ganov | 2016-12-05 | 1 | -4/+73 |
| | * | | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Remove config validity check" into nyc-... | Roshan Pius | 2016-12-07 | 1 | -7/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | DO NOT MERGE: WifiConfigStore: Remove config validity check | Roshan Pius | 2016-12-07 | 1 | -7/+0 |
| | | | |/ / / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge "DO NOT MERGE: Allow Carriers to specify Wifi Networks." into nyc-mr2-dev | Pankaj Kanwar | 2016-12-07 | 2 | -4/+349 |
| | |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | | * | | | | | | | | | DO NOT MERGE: Allow Carriers to specify Wifi Networks. | pkanwar | 2016-12-06 | 2 | -4/+349 |
 |
index : android_frameworks_opt_net_wifi | |
| Unnamed repository; edit this file 'description' to name the repository. |
| summaryrefslogtreecommitdiffstats |