summaryrefslogtreecommitdiffstats
path: root/services/tests/servicestests
diff options
context:
space:
mode:
authorAdrian Roos <roosa@google.com>2014-07-07 23:35:53 +0200
committerAdrian Roos <roosa@google.com>2014-07-10 17:07:36 +0000
commitc42a1e1071937ae48b7aa5d6291a32c29078b74b (patch)
treeb5806ebfdc7738b325b5e5488ae79fd81f507367 /services/tests/servicestests
parentcafd15216ee66a302ee69c0ea0c6c63b07a2f68c (diff)
downloadframeworks_base-c42a1e1071937ae48b7aa5d6291a32c29078b74b.zip
frameworks_base-c42a1e1071937ae48b7aa5d6291a32c29078b74b.tar.gz
frameworks_base-c42a1e1071937ae48b7aa5d6291a32c29078b74b.tar.bz2
Add AlarmClock API to AlarmManager
Adds a new kind of alarm that represents an alarm clock and a way to query the next scheduled alarm clock. Deprecates Settings.System.NEXT_ALARM_FORMATTED. Bug: 14589952 Change-Id: I297eeeff36d07adcda010afac183d0f5ee37dc99
Diffstat (limited to 'services/tests/servicestests')
-rw-r--r--services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java3
1 files changed, 2 insertions, 1 deletions
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.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;
@@ -879,7 +880,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase {
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());