summaryrefslogtreecommitdiff
path: root/core/java/android/net
Commit message (Expand)AuthorAgeFilesLines
* Merge changes from topic "network_request_match_callback"Roshan Pius2018-11-061-0/+15
|\
| * wifi(API): NetworkSpecifier for Wifi NetworkAgentRoshan Pius2018-10-311-0/+15
* | Merge "Extend onDnsEvent callback to report more fields." am: 89eb3e6117 am: ...Junyu Lai2018-11-041-2/+7
|\ \
| * \ Merge "Extend onDnsEvent callback to report more fields." am: 89eb3e6117Junyu Lai2018-11-041-2/+7
| |\ \
| | * \ Merge "Extend onDnsEvent callback to report more fields."Junyu Lai2018-11-051-2/+7
| | |\ \
| | | * | Extend onDnsEvent callback to report more fields.junyulai2018-10-311-2/+7
* | | | | Merge "interface-related commands porting" am: 808c2fa747 am: 21fecd5957Luke Huang2018-11-011-2/+40
|\| | | | | |_|_|/ |/| | |
| * | | Merge "interface-related commands porting" am: 808c2fa747Luke Huang2018-11-011-2/+40
| |\| |
| | * | Merge "interface-related commands porting"Luke Huang2018-11-011-2/+40
| | |\ \ | | | |/ | | |/|
| | | * interface-related commands portingLuke Huang2018-10-251-2/+40
* | | | Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: ...Junyu Lai2018-10-301-7/+17
|\| | |
| * | | Merge "Fix negative uid stats caused by 464xlat adjust when eBPF is on." am: ...Junyu Lai2018-10-301-7/+17
| |\| |
| | * | Fix negative uid stats caused by 464xlat adjust when eBPF is on.junyulai2018-10-301-7/+17
* | | | Merge "Refactor UidRange by using stable aidl structure" am: d1d3b374b7 am: 5...Luke Huang2018-10-282-20/+33
|\| | |
| * | | Merge "Refactor UidRange by using stable aidl structure" am: d1d3b374b7Luke Huang2018-10-282-20/+33
| |\| |
| | * | Merge "Refactor UidRange by using stable aidl structure"Treehugger Robot2018-10-292-20/+33
| | |\ \ | | | |/ | | |/|
| | | * Refactor UidRange by using stable aidl structureLuke Huang2018-10-242-20/+33
* | | | Merge "Firewall-related commands porting" am: 1acfa7de1b am: 6ba18c6b03Luke Huang2018-10-251-8/+8
|\| | |
| * | | Merge "Firewall-related commands porting" am: 1acfa7de1bLuke Huang2018-10-241-8/+8
| |\| |
| | * | Merge "Firewall-related commands porting"Luke Huang2018-10-251-8/+8
| | |\ \ | | | |/ | | |/|
| | | * Firewall-related commands portingLuke Huang2018-10-241-8/+8
* | | | Merge "To support skip464xlat per Network" am: a01c77a499 am: e826aa52e4Chalard Jean2018-10-251-0/+9
|\| | |
| * | | Merge "To support skip464xlat per Network" am: a01c77a499Chalard Jean2018-10-241-0/+9
| |\| |
| | * | Merge "To support skip464xlat per Network"Chalard Jean2018-10-241-0/+9
| | |\ \
| | | * | To support skip464xlat per NetworkYuuki Habu2018-10-121-0/+9
| * | | | Merge "Move some members to the "Q blacklist"." am: f5cf9f24edNathan Harold2018-10-243-5/+8
| |\| | |
| | * | | Move some members to the "Q blacklist".Mathew Inwood2018-10-223-5/+8
* | | | | Merge "Add new callback to inform blocking of network on specific uid." am: f...Junyu Lai2018-10-193-3/+51
|\| | | |
| * | | | Merge "Add new callback to inform blocking of network on specific uid." am: f...Junyu Lai2018-10-193-3/+51
| |\| | |
| | * | | Merge "Add new callback to inform blocking of network on specific uid."Junyu Lai2018-10-193-3/+51
| | |\ \ \
| | | * | | Add new callback to inform blocking of network on specific uid.junyulai2018-10-113-3/+51
* | | | | | Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d...Chalard Jean2018-10-191-14/+23
|\| | | | |
| * | | | | Merge "Fix a bug where Uri can't parse IPv6 literal addresses." am: 54677a86d4Chalard Jean2018-10-191-14/+23
| |\| | | |
| | * | | | Fix a bug where Uri can't parse IPv6 literal addresses.Chalard Jean2018-10-191-14/+23
| | | |_|/ | | |/| |
* | | | | Merge "Enterprise Policy for Private DNS Setting"Eran Messeri2018-10-171-0/+31
|\ \ \ \ \
| * | | | | Enterprise Policy for Private DNS SettingEran Messeri2018-10-151-0/+31
* | | | | | Merge "Change permissions checks for setAirplaneMode." am: 3889ff53ed am: 10c...Lorenzo Colitti2018-10-151-1/+4
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge "Change permissions checks for setAirplaneMode." am: 3889ff53edLorenzo Colitti2018-10-151-1/+4
| |\| | |
| | * | | Merge "Change permissions checks for setAirplaneMode."Lorenzo Colitti2018-10-151-1/+4
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Change permissions checks for setAirplaneMode.Lorenzo Colitti2018-10-121-1/+4
* | | | | Merge "Add log for debugging ConnectivityManager" am: 4b48dca2e8 am: e3c0f28a1eChalard Jean2018-10-111-0/+24
|\| | | |
| * | | | Merge "Add log for debugging ConnectivityManager" am: 4b48dca2e8Chalard Jean2018-10-111-0/+24
| |\| | |
| | * | | Merge "Add log for debugging ConnectivityManager"Chalard Jean2018-10-121-0/+24
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add log for debugging ConnectivityManagerSoi, Yoshinari2018-10-101-0/+24
* | | | | Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26d am: a...Lorenzo Colitti2018-10-101-1/+1
|\| | | |
| * | | | Merge "Make setAirplaneMode @SystemApi for SetupWizard." am: 772b75c26dLorenzo Colitti2018-10-101-1/+1
| |\| | |
| | * | | Make setAirplaneMode @SystemApi for SetupWizard.Lorenzo Colitti2018-10-101-1/+1
| | | |/ | | |/|
| * | | resolve merge conflicts of a3e34fe9fe4e2a8d0932e574721e5a8b94396c5e to pi-dev...Andrew Solovay2018-10-041-1/+1
| |\ \ \
| | * \ \ Merge "docs: Replacing {#link with {@link" into pi-devAndrew Solovay2018-10-041-1/+1
| | |\ \ \
| | | * | | docs: Replacing {#link with {@linkAndrew Solovay2018-10-041-1/+1