summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r3' of ↵HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Steve Kondik2015-12-081-7/+0
|\ | | | | | | | | | | https://android.googlesource.com/platform/frameworks/opt/net/ethernet into HEAD Android 6.0.1 release 3
| * Stop requiring CHANGE_NETWORK_STATE to change Ethernet config.Lorenzo Colitti2015-10-151-7/+0
| | | | | | | | | | | | | | | | | | Requiring CHANGE_NETWORK_STATE is pointless, since immediately after doing that we require CONNECTIVITY_INTERNAL, which is a system-only permission. Bug: 23597341 Change-Id: If4c8ecbb319e547c2c81d2dcc3c7bbb63e0bc2af
* | Merge tag 'android-6.0.0_r26' into cm-13.0Ricardo Cerqueira2015-11-051-1/+1
|\| | | | | | | Android 6.0.0 release 26
| * Don't crash on startup if we can't fetch the interface list.Lorenzo Colitti2015-09-081-1/+1
|/ | | | | | | | | The intent of the code was to catch exceptions, but it wasn't actually doing that because when a netd command fails we get an IllegalStateException, not a RemoteException. Bug: 23581852 Change-Id: I66c7c33bdc7b0d0de4fa5cd92dff054797cf860f
* Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGSBilly Lau2015-08-071-3/+4
| | | | | | | | | Replaced the method where we used to enforce static permission CHANGE_NETWORK_STATE to method calls that also check for WRITE_SETTINGS. This is due to the merging of CHANGE_NETWORK_STATE permission with WRITE_SETTINGS in M. Change-Id: I104ac41733663b4f6b5cd30e7314574ec4acdc07
* Stop DHCP if it times out.Lorenzo Colitti2015-08-041-1/+4
| | | | | | | | This was not necessary in L, but it is necessary after https://partner-android-review.googlesource.com/#/c/205415/ . Bug: 22936203 Change-Id: I24a96c33e5bb375f36217a1c2cec2076eb5ac8b4
* am 23518c13: am d08728aa: Merge commit ↵Bill Yi2015-02-200-0/+0
|\ | | | | | | | | | | \'a3d7e61812f8d68ca109280c4e7589e4f968723a\' into HEAD * commit '23518c13828ff82d5284f9df2e8f8b0690e76c46':
| * am d08728aa: Merge commit \'a3d7e61812f8d68ca109280c4e7589e4f968723a\' into HEADBill Yi2015-02-200-0/+0
| |\ | | | | | | | | | * commit 'd08728aa5050ca03b6954ddb708146e16c1fb53a':
| | * Merge commit 'a3d7e61812f8d68ca109280c4e7589e4f968723a' into HEADBill Yi2015-02-192-43/+85
| | |\
* | | | am 52334a19: am ef8e0b94: eth: make sure dhcp is stopped before bringing up ↵Pierre Couillaud2015-02-161-0/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | interface. * commit '52334a190a36d6fdbfcf0a38526925183f396fb2': eth: make sure dhcp is stopped before bringing up interface.
| * | | am ef8e0b94: eth: make sure dhcp is stopped before bringing up interface.Pierre Couillaud2015-02-161-0/+1
| |\| | | | |/ | |/| | | | | | | * commit 'ef8e0b9491467cf8d49fa3af7d43f12e3bd524e4': eth: make sure dhcp is stopped before bringing up interface.
| | * eth: make sure dhcp is stopped before bringing up interface.Pierre Couillaud2015-02-111-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Pierre Couillaud <pierre@broadcom.com> Signed-off-by: Blair Prescott <blairp@broadcom.com>
* | | am a3d7e618: Add an API to check availability of Ethernet interface.Jaewan Kim2014-11-212-43/+85
|\| | | | | | | | | | | | | | * commit 'a3d7e61812f8d68ca109280c4e7589e4f968723a': Add an API to check availability of Ethernet interface.
| * | Add an API to check availability of Ethernet interface.Jaewan Kim2014-11-192-43/+85
| |/ | | | | | | | | Bug: 18045481 Change-Id: I3fb517c3e7fa807e2937fda92026301e312be986
* | am 74d270d1: Clear all Ethernet state when our interface goes away.Lorenzo Colitti2014-10-021-1/+6
|\| | | | | | | | | * commit '74d270d167ed6c3a6fa28e426da80d51a44a2af0': Clear all Ethernet state when our interface goes away.
| * Clear all Ethernet state when our interface goes away.staging/cm-12.0-cafstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Lorenzo Colitti2014-10-011-1/+6
| | | | | | | | | | | | | | | | | | Previously we did not stop DHCP or try to force a disconnect. This made it impossible to reconnect by unplugging and replugging an USB Ethernet adapter. Bug: 17736828 Change-Id: Idd8576a96b063b5ca726ee9149800bdcb0f62bd1
* | am e3cbf2e7: Don\'t accept score below 0.Robert Greenwalt2014-09-111-1/+7
|\| | | | | | | | | * commit 'e3cbf2e7349dd366f33905784595e2e3a1cec245': Don't accept score below 0.
| * Don't accept score below 0.Robert Greenwalt2014-09-101-1/+7
| | | | | | | | | | | | | | | | | | Network Factories are allowed to go below, but networks need to be constrained. Allowing the network to go below 0 meant that -1 could sometimes leak through and foul the logic. bug:17361330 Change-Id: Ife34ca0f9c233dd3c3df80f6fea580af43afcdeb
* | am 69b9c6a7: Use config resource for tcp buffer sizeRobert Greenwalt2014-08-221-4/+5
|\| | | | | | | | | * commit '69b9c6a7d6453c1c76857c5edfeb1d89a1315674': Use config resource for tcp buffer size
| * Use config resource for tcp buffer sizeRobert Greenwalt2014-08-211-4/+5
| | | | | | | | | | bug:16549611 Change-Id: I48426f6b746e4bd9729bdd529d81b163ff5112a9
* | am aea43f59: Actually provide useful output in Ethernet service dump.Lorenzo Colitti2014-08-202-2/+28
|\| | | | | | | | | * commit 'aea43f5901e6591c390b83b10d3dd9b515a6442a': Actually provide useful output in Ethernet service dump.
| * Actually provide useful output in Ethernet service dump.Lorenzo Colitti2014-08-192-2/+28
| | | | | | | | | | Bug: 17133859 Change-Id: Ic8424004e48712e4dd906d5bb6a48ce7d38ff9d8
* | am 41a372f1: Stop using LinkProperties for static configuration.Lorenzo Colitti2014-08-193-33/+41
|\| | | | | | | | | * commit '41a372f13a7d19807d91e09f2e955b8a61f02d5c': Stop using LinkProperties for static configuration.
| * Stop using LinkProperties for static configuration.Lorenzo Colitti2014-08-193-33/+41
| | | | | | | | | | | | | | | | | | Also make static IP configuration more robust (e.g., tear down our NetworkAgent when we switch between static and DHCP). Bug: 16114392 Bug: 16893413 Change-Id: Ib33f35c004e30b6067bb20235ffa43c247d174df
* | am dcbf3b90: Add tcp buffer size data for ethernetRobert Greenwalt2014-08-171-0/+5
|\| | | | | | | | | * commit 'dcbf3b908024d9ce1d3bf9216f8af11503459afc': Add tcp buffer size data for ethernet
| * Add tcp buffer size data for ethernetRobert Greenwalt2014-08-151-0/+5
| | | | | | | | | | bug: 16549611 Change-Id: I61d29bb88b9e58c50e03c39570f3ebb7712e4f37
* | am 3191f909: (-s ours) DO NOT MERGE Don\'t tear down based on NetworkFactory ↵Robert Greenwalt2014-07-220-0/+0
|\| | | | | | | | | | | | | input. * commit '3191f909a20216646f1652537eba6804b5435c74': DO NOT MERGE Don't tear down based on NetworkFactory input.
| * DO NOT MERGE Don't tear down based on NetworkFactory input.Robert Greenwalt2014-07-221-26/+25
| | | | | | | | | | | | | | | | | | | | | | NetworkFactory only indicates if we're interested in new connections. It shouldn't be used to tear down existing connections (they have unwanted callbacks for that). Supports linger properly as well as dealing with tie scores. bug:15612739 Change-Id: Ib3dfe673d3645b9dc4756c176958409a64ec32e4 (cherry picked from commit ed75bcf13a0b416843cf8d8e349a3340ae270f9d)
* | Don't tear down based on NetworkFactory input.Robert Greenwalt2014-06-231-26/+25
|/ | | | | | | | | | | NetworkFactory only indicates if we're interested in new connections. It shouldn't be used to tear down existing connections (they have unwanted callbacks for that). Supports linger properly as well as dealing with tie scores. bug:15612739 Change-Id: Ib3dfe673d3645b9dc4756c176958409a64ec32e4
* am 4b1ec3fc: Make NetworkCapabilities publicly immutable.Robert Greenwalt2014-06-121-3/+2
|\ | | | | | | | | * commit '4b1ec3fc8e4e4b432328297c45519fa4f6baa3cd': Make NetworkCapabilities publicly immutable.
| * Make NetworkCapabilities publicly immutable.Robert Greenwalt2014-06-111-3/+2
| | | | | | | | | | | | | | Applying API council comments. bug: 15142362 Change-Id: Ie0bde68b72656a676d90c0343b9756fe9268d8d6
* | am ff0bf8dc: Fix ethernet.Robert Greenwalt2014-06-061-11/+0
|\| | | | | | | | | * commit 'ff0bf8dcf33f32eee17a6af5f688f6b5fef13aac': Fix ethernet.
| * Fix ethernet.Robert Greenwalt2014-06-041-11/+0
| | | | | | | | | | | | | | | | It was attempting to update the NetworkAgent before the NetworkAgent was created, causing NullPointerExceptions. bug:15407938 Change-Id: Ie36b906df4b12f095a16d1b30c847a55b074d60c
* | am 0d1b1749: Apply refactored NetworkFactory.Robert Greenwalt2014-06-040-0/+0
|\| | | | | | | | | * commit '0d1b1749dad71372d9baeb0f852d3d91fccac73d': Apply refactored NetworkFactory.
| * Apply refactored NetworkFactory.Robert Greenwalt2014-06-031-118/+69
| | | | | | | | | | | | | | | | | | Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent. Factory will track requests and by default give a single connect/disconnect api for ease of use. Then NetworkAgent is created and destroyed as needed with very simple logic. Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291 (cherry picked from commit a0a5625c7fa746d363b743ff7c662888a459d392)
* | Apply refactored NetworkFactory.Robert Greenwalt2014-06-021-118/+69
| | | | | | | | | | | | | | | | Make NetworkFactory a concrete class and divide responsibilites between it and NetworkAgent. Factory will track requests and by default give a single connect/disconnect api for ease of use. Then NetworkAgent is created and destroyed as needed with very simple logic. Change-Id: I401c14a6e5466f2fc63b04219b97ff85bb9af291
* | am 044a758e: (-s ours) DO NOT MERGE - Make Ethernet more reliable.Lorenzo Colitti2014-05-280-0/+0
|\| | | | | | | | | * commit '044a758ebb1e38df875a45e9cfe84f4a53352aba': DO NOT MERGE - Make Ethernet more reliable.
| * DO NOT MERGE - Make Ethernet more reliable.Lorenzo Colitti2014-05-281-22/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. If DHCP fails, set the score to 0. Coupled with changes in NetworkAgent, that will cause us to retry DHCP the next time the link is plugged in. 2. Send LinkProperties before sending NetworkInfo, because of a race in NetworkAgent. 3. Make Ethernet work properly after a runtime restart. 4. Improve locking. 5. Clarify how things work in comments. Bug: 15295359 Change-Id: I06cd683a1633838bca1ec177e61f1829889d3934 (cherry picked from commit 8c797f82fd3856effc121cb2d096fabbb66221a1)
* | Make Ethernet more reliable.Lorenzo Colitti2014-05-281-22/+85
|/ | | | | | | | | | | | | | 1. If DHCP fails, set the score to 0. Coupled with changes in NetworkAgent, that will cause us to retry DHCP the next time the link is plugged in. 2. Send LinkProperties before sending NetworkInfo, because of a race in NetworkAgent. 3. Make Ethernet work properly after a runtime restart. 4. Improve locking. 5. Clarify how things work in comments. Bug: 15295359 Change-Id: I06cd683a1633838bca1ec177e61f1829889d3934
* Initial EthernetService implementation.Lorenzo Colitti2014-05-215-0/+713
| | | | | | Bug: 14981801 Bug: 14993642 Change-Id: If392ef7063e096854ef830f4fe3b038439a1d307
* Initial empty repositoryAlex Cheung2014-05-200-0/+0