Merge "Merge "Resume throwing if too many concurrent alarms" into qt-dev am: 168f5980f7" into qt-dev-plus-aosp

2019-05-08 00:24:49 +00:00
parent f5beb39986 b9a16bf514
commit 02f98c70ae
1 changed files with 1 additions and 2 deletions
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -1764,8 +1764,7 @@ class AlarmManagerService extends SystemService {
                                + ", callingPackage: " + callingPackage;
                // STOPSHIP (b/128866264): Just to catch breakages. Remove before final release.
                Slog.wtf(TAG, errorMsg);
-                // TODO b/129995049: Resume throwing after some soak time without errors
-                // throw new UnsupportedOperationException(errorMsg);
+                throw new UnsupportedOperationException(errorMsg);
            }
            setImplLocked(type, triggerAtTime, triggerElapsed, windowLength, maxElapsed,
                    interval, operation, directReceiver, listenerTag, flags, true, workSource,