Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 24c089a8: Fix build.

Browse Source 
* commit '24c089a8b5871b331441d0858aa164364b7737cb':
  Fix build.
This commit is contained in:
Narayan Kamath
2014-04-11 10:54:20 +00:00
committed by Android Git Automerger
parent c3255ae04c 24c089a8b5
commit 80edaa676b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java
View File

@@ -216,7 +216,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
expectLastCall().atLeastOnce(); expectLastCall().atLeastOnce();
// expect to answer screen status during systemReady() // expect to answer screen status during systemReady()
expect(mPowerManager.isScreenOn()).andReturn(true).atLeastOnce(); expect(mPowerManager.isInteractive()).andReturn(true).atLeastOnce();
expect(mNetworkManager.isBandwidthControlEnabled()).andReturn(true).atLeastOnce(); expect(mNetworkManager.isBandwidthControlEnabled()).andReturn(true).atLeastOnce();
expectCurrentTime(); expectCurrentTime();
@@ -331,7 +331,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
verifyAndReset(); verifyAndReset();
// now turn screen off and verify REJECT rule // now turn screen off and verify REJECT rule
expect(mPowerManager.isScreenOn()).andReturn(false).atLeastOnce(); expect(mPowerManager.isInteractive()).andReturn(false).atLeastOnce();
expectSetUidNetworkRules(UID_A, true); expectSetUidNetworkRules(UID_A, true);
expectSetUidForeground(UID_A, false); expectSetUidForeground(UID_A, false);
future = expectRulesChanged(UID_A, RULE_REJECT_METERED); future = expectRulesChanged(UID_A, RULE_REJECT_METERED);
@@ -341,7 +341,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase {
verifyAndReset(); verifyAndReset();
// and turn screen back on, verify ALLOW rule restored // and turn screen back on, verify ALLOW rule restored
expect(mPowerManager.isScreenOn()).andReturn(true).atLeastOnce(); expect(mPowerManager.isInteractive()).andReturn(true).atLeastOnce();
expectSetUidNetworkRules(UID_A, false); expectSetUidNetworkRules(UID_A, false);
expectSetUidForeground(UID_A, true); expectSetUidForeground(UID_A, true);
future = expectRulesChanged(UID_A, RULE_ALLOW_ALL); future = expectRulesChanged(UID_A, RULE_ALLOW_ALL);