summaryrefslogtreecommitdiffstats
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* Merge "Revert "Refactor IpConfiguration from WifiConfiguration""Jaewan Kim2014-04-072-531/+0
|\
| * Revert "Refactor IpConfiguration from WifiConfiguration"Jaewan Kim2014-04-072-531/+0
* | Revert "Hide IpConfiguration"Jaewan Kim2014-04-071-5/+19
* | Hide IpConfigurationJaewan Kim2014-04-071-19/+5
* | Merge "Refactor IpConfiguration from WifiConfiguration"Jaewan Kim2014-04-072-0/+531
|\ \ | |/
| * Refactor IpConfiguration from WifiConfigurationJaewan Kim2014-04-072-0/+531
* | Merge "Document and enforce "one request per Listener" rule"Dave Platt2014-04-021-24/+58
|\ \
| * | Document and enforce "one request per Listener" ruleDave Platt2014-03-311-24/+58
* | | am 7156b7c6: am b11952d6: am e3434fc4: Merge "Improve detail message for X509...Brian Carlstrom2014-03-311-1/+2
|\ \ \
| * \ \ am b11952d6: am e3434fc4: Merge "Improve detail message for X509TrustManagerE...Brian Carlstrom2014-03-311-1/+2
| |\ \ \
| | * | | Improve detail message for X509TrustManagerExtensions argument validationBrian Carlstrom2014-03-311-1/+2
* | | | | am 1dc1d6b2: am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: init...Kenny Root2014-03-271-1/+10
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am 5b93685a: am 57f2764b: Merge "CertificateChainValidator: initialize TrustM...Kenny Root2014-03-271-1/+10
| |\ \ \ | | |/ /
| | * | CertificateChainValidator: initialize TrustManagerFactoryKenny Root2014-03-261-1/+10
* | | | am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTr...Kenny Root2014-03-254-34/+387
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt"Kenny Root2014-03-254-34/+387
| |\ \ | | |/
| | * Use X509ExtendedTrustManager and not ConscryptKenny Root2014-03-244-34/+387
* | | am 7ae93b1d: am 92ec0a0c: am d8c32164: am 88517170: Merge "Adjust to the chan...Alex Klyubin2014-03-241-2/+2
|\ \ \ | |/ /
| * | am d8c32164: am 88517170: Merge "Adjust to the change in the private SSLParam...Alex Klyubin2014-03-211-2/+2
| |\ \ | | |/
| | * Adjust to the change in the private SSLParameterImpl API.Alex Klyubin2014-03-211-2/+2
* | | Merge "EthernetDataTracker: Set more detailed status"Jaewan Kim2014-03-201-0/+2
|\ \ \
| * | | EthernetDataTracker: Set more detailed statusJaewan Kim2014-03-171-0/+2
* | | | resolved conflicts for merge of 0bff77d6 to masterRobert Greenwalt2014-03-191-0/+11
|\ \ \ \ | | |/ / | |/| |
| * | | am bd84f01c: am 5d3d4ee3: Merge "Handle provisioning APN by turning off/on da...Robert Greenwalt2014-03-191-0/+11
| |\ \ \
| | * \ \ Merge "Handle provisioning APN by turning off/on data." into klp-devRobert Greenwalt2014-03-191-0/+11
| | |\ \ \
| | | * | | Handle provisioning APN by turning off/on data.Wink Saville2014-03-181-0/+11
| * | | | | am 17e7c407: am 98a027a5: Merge "Harden NsdManager against null-dereference c...Dave Platt2014-03-191-19/+28
| |\ \ \ \ \ | | |/ / / /
| | * | | | Harden NsdManager against null-dereference crashesDave Platt2014-03-131-19/+28
| * | | | | am 78f204ae: am 8e240af5: Merge "Remove SO_BINDTODEVICE from VPN protect" int...Chad Brubaker2014-03-141-3/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove SO_BINDTODEVICE from VPN protectChad Brubaker2014-03-111-3/+4
| * | | | | am 1011960c: am decfd707: Merge "Add the calling package name to requestRoute...Chad Brubaker2014-03-132-4/+7
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add the calling package name to requestRouteToHostChad Brubaker2014-03-052-4/+7
* | | | | | Include elapsed realtime (nanos) of the event in the radio state change notif...Ashish Sharma2014-03-182-1/+7
| |_|_|/ / |/| | | |
* | | | | EthernetDataTracker: Update hardware address when interface is changedJaewan Kim2014-03-141-16/+25
* | | | | Merge "EthernetDataTracker: Return proper interface name"Jaewan Kim2014-03-131-0/+5
|\ \ \ \ \
| * | | | | EthernetDataTracker: Return proper interface nameJaewan Kim2014-03-101-0/+5
* | | | | | Merge "Add a warning about the SSID format in CaptivePortalTracker."Jeff Davidson2014-03-061-0/+7
|\ \ \ \ \ \
| * | | | | | Add a warning about the SSID format in CaptivePortalTracker.Jeff Davidson2014-02-071-0/+7
* | | | | | | am bf588bda: am f08cd8c6: am 7d8262cb: am 22f66b76: Merge "Harden NsdManager ...Dave Platt2014-03-041-19/+28
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ am 7d8262cb: am 22f66b76: Merge "Harden NsdManager against null-dereference c...Dave Platt2014-03-041-19/+28
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | Harden NsdManager against null-dereference crashesDave Platt2014-03-041-19/+28
| | * | | | | Fix descriptor leak after accepting connectionsDave Platt2014-02-281-1/+1
* | | | | | | Merge "Allow more proxy bypass patterns"Yuhao Zheng2014-03-041-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Allow more proxy bypass patternsYuhao Zheng2014-03-031-2/+4
* | | | | | | | Merge "Return detailed reason of invalid proxy settings"Yuhao Zheng2014-03-042-24/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Return detailed reason of invalid proxy settingsYuhao Zheng2014-03-032-24/+24
| |/ / / / / /
* | | | | | | Hold a wake lock while dispatching network activity events.Dianne Hackborn2014-02-281-4/+97
* | | | | | | Merge "Remove SO_BINDTODEVICE from VPN protect"Chad Brubaker2014-02-281-3/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove SO_BINDTODEVICE from VPN protectChad Brubaker2014-02-131-3/+4
| | |_|/ / / | |/| | | |
* | | | | | Collect per-uid mobile radio usage.Dianne Hackborn2014-02-261-0/+11