commit 1353bdbdd50000a43a425111252d3b434d24ab5d
author Chris Tate <ctate@android.com> Thu Dec 10 01:18:14 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 10 01:18:14 2015 +0000
tree e169ae61bb5257e7e4dd9e666c3efc829aeb131e
parent 6c24afe4b03b6ca68153e7d90497065d31bb05db
parent ff6390cda43a0333a93c6b87a8eac5484e5ba8e9

Merge "Allow direct-callback alarms for non-wakeup alarms"

services/core/java/com/android/server/AlarmManagerService.java

diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 960fb4b..5f57a76 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -1233,14 +1233,6 @@
                 }
             }
 
-            // direct-callback alarms must be wakeup alarms (otherwise they should just be
-            // posting work to a Handler)
-            if (directReceiver != null) {
-                if (type != RTC_WAKEUP && type != ELAPSED_REALTIME_WAKEUP) {
-                    throw new IllegalArgumentException("Only wakeup alarms can use AlarmReceivers");
-                }
-            }
-
             if (workSource != null) {
                 getContext().enforcePermission(
                         android.Manifest.permission.UPDATE_DEVICE_STATS,