diff options
author | Narayan Kamath <narayan@google.com> | 2014-04-11 10:57:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-11 10:57:28 +0000 |
commit | 629f76682729a63c0e3d29f836c3c69c6fdb4c77 (patch) | |
tree | 728c83810c1888648ecd4ce892ee99d1b5e9e6be /services/tests | |
parent | 26ad3af74d4b8a6f960de7a4370684a987551f6d (diff) | |
parent | 80edaa676bd59409f8a82e12c035bee96e653004 (diff) | |
download | frameworks_base-629f76682729a63c0e3d29f836c3c69c6fdb4c77.zip frameworks_base-629f76682729a63c0e3d29f836c3c69c6fdb4c77.tar.gz frameworks_base-629f76682729a63c0e3d29f836c3c69c6fdb4c77.tar.bz2 |
am 80edaa67: am 24c089a8: Fix build.
* commit '80edaa676bd59409f8a82e12c035bee96e653004':
Fix build.
Diffstat (limited to 'services/tests')
-rw-r--r-- | services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java index 8b9f718..8392672 100644 --- a/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/NetworkPolicyManagerServiceTest.java @@ -216,7 +216,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { expectLastCall().atLeastOnce(); // 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(); expectCurrentTime(); @@ -331,7 +331,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { verifyAndReset(); // now turn screen off and verify REJECT rule - expect(mPowerManager.isScreenOn()).andReturn(false).atLeastOnce(); + expect(mPowerManager.isInteractive()).andReturn(false).atLeastOnce(); expectSetUidNetworkRules(UID_A, true); expectSetUidForeground(UID_A, false); future = expectRulesChanged(UID_A, RULE_REJECT_METERED); @@ -341,7 +341,7 @@ public class NetworkPolicyManagerServiceTest extends AndroidTestCase { verifyAndReset(); // 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); expectSetUidForeground(UID_A, true); future = expectRulesChanged(UID_A, RULE_ALLOW_ALL); |