commit 11e39d2fb72b4b2fdd76d3dcd1d17b1d88d90593
author Robert Greenwalt <rgreenwalt@google.com> Thu Jul 10 19:02:55 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 09 21:39:59 2014 +0000
tree a5d750e667162f993d47a74118dc63abedbc3ced
parent 9d896191e56b557b0ed37ecdc87c710e4b63cfbb
parent 02fe11eba35c8d2ea0c8b293241d60520f7943cd

Merge "Add Network inspection API."

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

diff --git a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
index a1af8cb..8aae695 100644
--- a/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java
@@ -47,6 +47,7 @@
 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;
@@ -879,7 +880,7 @@
         expectLastCall().anyTimes();
 
         mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), anyLong(),
-                isA(PendingIntent.class), isA(WorkSource.class));
+                isA(PendingIntent.class), isA(WorkSource.class), isA(AlarmClockInfo.class));
         expectLastCall().atLeastOnce();
 
         mNetManager.setGlobalAlert(anyLong());