commit bfe08f7b33800f1487d78f9883628b0902bc1f8c
author Amit Pawar <amitpawar@google.com> Thu Mar 23 22:53:44 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 23 22:53:49 2017 +0000
tree 1a0aab1461f99be9a86f78f5de30e0e0f05ca36c
parent ed507a3f10255c3d130412b915cde84d62191665
parent bc4d0d923f5db95d7b3560c0aaf72e77ca4a1bf9

Merge "Ignore notifications with zero-timing vibrations."

services/core/java/com/android/server/notification/NotificationManagerService.java

diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index eb22d5d..ede5a5e 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -179,6 +179,7 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -3651,6 +3652,10 @@
             mVibrator.vibrate(record.sbn.getUid(), record.sbn.getOpPkg(),
                     effect, record.getAudioAttributes());
             return true;
+        } catch (IllegalArgumentException e) {
+            Slog.e(TAG, "Error creating vibration waveform with pattern: " +
+                    Arrays.toString(vibration));
+            return false;
         } finally{
             Binder.restoreCallingIdentity(identity);
         }