diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-10-28 12:56:03 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2017-01-18 19:08:02 +0900 |
| commit | 073e5e94ad95b540501df6ea6937003359f23ac0 (patch) | |
| tree | ba649ccaf199d646f2e8271fbb5eac2460b8f6bf /tools/aapt2/diff/Diff.cpp | |
| parent | 9997f1489a56a4d11b3381d04ea4a18ef5f73c3d (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
(cherry picked from commit 3c295b59f5767904656235db48692906148ab631)
Change-Id: I8a95d4618dced81f173d2b38b9c1dfe3860b348a
Diffstat (limited to 'tools/aapt2/diff/Diff.cpp')
0 files changed, 0 insertions, 0 deletions