git.osdn.net Git - android-x86/frameworks-base.git/commit

author	Erik Kline <ek@google.com>
	Thu, 9 Mar 2017 02:44:11 +0000 (11:44 +0900)
committer	Erik Kline <ek@google.com>
	Wed, 21 Jun 2017 07:41:31 +0000 (16:41 +0900)
commit	1e54351ac09478710c17fcfbb0c1de257948a1d5
tree	20a30775a9156008e7f17f4519de7a1779c2fa7a	tree \| snapshot
parent	104b68d0a5c8b0bcf3adc01bff69209ed8d38f34	commit \| diff

Always allow Ethernet to be an upstream

If there are any upstream types defined at all, make sure that
either TYPE_ETHERNET is included somewhere within the sorted list
or force it to be at the front.

Test: as follows
    - built
    - flashed
    - booted
    - runtest frameworks-net passes
Bug: 32163131
Bug: 36076442

Merged-In: I97737f4c12285f0bbeed0bd2efdfec6fbe95fd03
Merged-In: Id60706e623febcc35063ccb96c797fc4f9a223b1
Merged-In: I97cc3c5ad7dcd4359c28e6aa817856a226a4f8cc
Change-Id: Ie61d1358f73d518de23f6ca48ca2765ca14a1067
(cherry picked from commit 0e61baa0ac83e580429217f8394e1790d6510158)

services/core/java/com/android/server/connectivity/tethering/TetheringConfiguration.java		diff \| blob \| history
tests/net/java/com/android/server/connectivity/tethering/TetheringConfigurationTest.java		diff \| blob \| history