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

author	Lorenzo Colitti <lorenzo@google.com>
	Fri, 28 Oct 2016 03:56:03 +0000 (12:56 +0900)
committer	Lorenzo Colitti <lorenzo@google.com>
	Thu, 8 Dec 2016 08:13:35 +0000 (17:13 +0900)
commit	3c295b59f5767904656235db48692906148ab631
tree	a23987ebbc62803911eda2a59d628ed41db2f68e	tree \| snapshot
parent	b8df76e413d0b8235d0bd71adf8f368f00391fcb	commit \| diff

DO NOT MERGE: De-guava BroadcastInterceptingContext and move it to testutils.

Removing the static dependency on guava reduces test compile time
by about 20 seconds on a Z840, thus substantially speeding up the
compile/test cycle.

Make FutureIntent public instead of package-private because it is
used directly by NetworkPolicyManagementServiceTest, which as of
this CL is now in a different package.

(cherry picked from commit 281a17c9580de5c9898be7d9654d428801976511)

Test: runtest frameworks-services -c com.android.server.ConnectivityServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkPolicyManagerServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.net.NetworkStatsServiceTest  # PASS
Test: runtest frameworks-services -c com.android.server.NetworkManagementServiceTest  # Already failing.
Bug: 31479480
Change-Id: Ifab32c9214e9caab71dbf93b3d3ca88df6f49636

services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/NetworkManagementServiceTest.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java		diff \| blob \| history
services/tests/servicestests/src/com/android/server/net/NetworkStatsServiceTest.java		diff \| blob \| history
tests/utils/testutils/java/com/android/internal/util/test/BroadcastInterceptingContext.java	[moved from services/tests/servicestests/src/com/android/server/BroadcastInterceptingContext.java with 89% similarity]	diff \| blob \| history