Merge "Properly check to see if a suppressor is present before returning it." into nyc-dev

2016-04-12 19:42:07 +00:00
parent 997743d29e ba3d895283
commit 39a878dbca
1 changed files with 1 additions and 1 deletions
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -2009,7 +2009,7 @@ public class NotificationManagerService extends SystemService {
        @Override
        public ComponentName getEffectsSuppressor() {
            enforceSystemOrSystemUIOrVolume("INotificationManager.getEffectsSuppressor");
-            return mEffectsSuppressors.get(0);
+            return !mEffectsSuppressors.isEmpty() ? mEffectsSuppressors.get(0) : null;
        }

        @Override