OSDN Git Service

DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.
authorLorenzo Colitti <lorenzo@google.com>
Fri, 28 Oct 2016 08:45:55 +0000 (17:45 +0900)
committerLorenzo Colitti <lorenzo@google.com>
Thu, 8 Dec 2016 08:13:36 +0000 (17:13 +0900)
commit5bce5a16b17498981253d7a2d1a490667cd71798
treeb111bc3d2a7efdfb631c928bda7f633620ca2361
parent7ceef950a02b22bdf90609bdab8119b4bcd88edf
DO NOT MERGE: Unbreak TetherInterfaceStateMachineTest.

This was broken by the implementation of IPv6 tethering, which
relies on various private classes which end up calling unmockable
final classes like NetworkInterface.

Making everything public like this is almost certainly not the
best way of fixing this test, but on the other hand there is
value to the test continuing to pass.

Test: runtest frameworks-net  # Everything passes.
Test: IPv6 tethering continues to work.

(cherry picked from commit 7e0eeca8ba4063d0d35dda9a8dfcc612e45efb87)

Change-Id: I8a3cf466871c026f4ae0f5cfa73071338cdf5b7e
services/core/java/com/android/server/connectivity/Tethering.java
services/core/java/com/android/server/connectivity/tethering/IPv6TetheringInterfaceServices.java
services/core/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachine.java
tests/net/java/com/android/server/connectivity/tethering/TetherInterfaceStateMachineTest.java