summaryrefslogtreecommitdiffstats
Commit message (Expand)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
|\
| * 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
| * | | | | | | | | | | | | DO NOT MERGE: Fix to enable reconnecting to a Carrier network.pkanwar2017-01-182-17/+36
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | DO NOT MERGE: Fix to maintain the Carrier Network connection.pkanwar2017-01-134-4/+11
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "[DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggle" into n...Rebecca Silberstein2017-01-112-8/+18
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | [DO NOT MERGE] WifiStateMachine: prevent erroneous wifi toggleRebecca Silberstein2017-01-052-8/+18
| | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfiguration...Roshan Pius2017-01-111-0/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | DO NOT MERGE: WifiConfigStore: Strip out FT flags in WifiConfigurationRoshan Pius2017-01-101-0/+9
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | DO NOT MERGE ANYWHERE: Connect to Carrier networks if enabled inpkanwar2017-01-103-1/+45
| |/ / / / / / / / /
| * | | | | | | | | DO NOT MERGE: Fix null dereference in carrier networksPaul Stewart2017-01-051-1/+1
| |/ / / / / / / /
| * | | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476...Peter Qiu2017-01-041-10/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1a am: bd91d4a476Peter Qiu2017-01-041-10/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-dev am: f35c310b1aPeter Qiu2017-01-041-10/+0
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ resolve merge conflicts of fe09754c1 to nyc-devPeter Qiu2017-01-041-10/+0
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration file am: de3de10eec am: 8d...Peter Qiu2017-01-041-6/+0
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration file am: de3de10eecPeter Qiu2017-01-041-6/+0
| | | | | | | |\ \ \ \ \ \ \
| | | | | | | | * \ \ \ \ \ \ configparse: do not delete passpoint configuration filePeter Qiu2017-01-041-6/+0
| | | | | | | | |\ \ \ \ \ \ \
| | | | | | | | | * | | | | | | configparse: do not delete passpoint configuration filePeter Qiu2016-12-121-6/+0
| * | | | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi.Ivan Podogov2017-01-031-13/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | In permission review mode, always request user's consent to toggle WiFi.Ivan Podogov2016-12-161-13/+10
| * | | | | | | | | | | | | | 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-224-0/+71
| | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | 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
| | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | DO NOT MERGE: Allow Carriers to specify Wifi Networks.pkanwar2016-12-203-132/+296
| |/ / / / / / / / / / / /
| * | | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO listRoshan Pius2016-12-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | DO NOT MERGE: WifiConfigManager: Ignore disabled networks in PNO listRoshan Pius2016-12-152-6/+21
| * | | | | | | | | | | | Merge "Send CMD_DISCONNECT after removing app/user configs DO NOT MERGE" into...Robin Lee2016-12-152-27/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Send CMD_DISCONNECT after removing app/user configs DO NOT MERGERobin Lee2016-12-092-27/+45
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge "DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAM" into ...TreeHugger Robot2016-12-131-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | DO NOT MERGE: WifiStateMachine: Add null check in CMD_AUTO_ROAMRoshan Pius2016-12-131-0/+4
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Add WiFi toggle prompts - wifiSvetoslav Ganov2016-12-131-4/+73
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | / / / / / / / / | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Add WiFi toggle prompts - wifiSvetoslav Ganov2016-12-051-4/+73
| * | | | | | | | | | Merge "DO NOT MERGE: WifiConfigStore: Remove config validity check" into nyc-...Roshan Pius2016-12-071-7/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | DO NOT MERGE: WifiConfigStore: Remove config validity checkRoshan Pius2016-12-071-7/+0
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | 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-072-4/+349