summaryrefslogtreecommitdiffstats
path: root/services/tests
diff options
context:
space:
mode:
authorJose Lima <joselima@google.com>2014-08-13 12:50:01 -0700
committerJose Ricardo Lima <joselima@google.com>2014-08-14 02:10:41 +0000
commit235510e67210f90de30c2d5582a2077ccc589619 (patch)
treef03ee027a96a47c9b321521e50a29448da069c47 /services/tests
parent4b6c6697da5a20c08b2f9f2ca40c94008477e914 (diff)
downloadframeworks_base-235510e67210f90de30c2d5582a2077ccc589619.zip
frameworks_base-235510e67210f90de30c2d5582a2077ccc589619.tar.gz
frameworks_base-235510e67210f90de30c2d5582a2077ccc589619.tar.bz2
Made AlarmClockInfo a nested class in AlarmManager
Bug: 16959028 Change-Id: I150eaaff765d1e214c3621c1bf50162ec0dac8ec
Diffstat (limited to 'services/tests')
-rw-r--r--services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
index 8aae695..c3d4ed9 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
@@ -47,7 +47,6 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.expectLastCall;
import static org.easymock.EasyMock.isA;
-import android.app.AlarmClockInfo;
import android.app.AlarmManager;
import android.app.IAlarmManager;
import android.app.PendingIntent;
@@ -880,7 +879,8 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
expectLastCall().anyTimes();
mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), anyLong(),
- isA(PendingIntent.class), isA(WorkSource.class), isA(AlarmClockInfo.class));
+ isA(PendingIntent.class), isA(WorkSource.class),
+ isA(AlarmManager.AlarmClockInfo.class));
expectLastCall().atLeastOnce();
mNetManager.setGlobalAlert(anyLong());