Merge "Fix wrong array index bound in NotificationUsageStats"

2017-07-07 21:20:40 +00:00
parent 476d58c6bd ea50f804a4
commit 87e893a449
1 changed files with 3 additions and 2 deletions
--- a/services/core/java/com/android/server/notification/NotificationUsageStats.java
+++ b/services/core/java/com/android/server/notification/NotificationUsageStats.java
@@ -40,6 +40,7 @@ import org.json.JSONException;
 import org.json.JSONObject;

 import java.io.PrintWriter;
+import java.lang.Math;
 import java.util.ArrayDeque;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
@@ -718,8 +719,8 @@ public class NotificationUsageStats {
        }

        void increment(int imp) {
-            imp = imp < 0 ? 0 : imp > NUM_IMPORTANCES ? NUM_IMPORTANCES : imp;
-            mCount[imp] ++;
+            imp = Math.max(0, Math.min(imp, mCount.length - 1));
+            mCount[imp]++;
        }

        void maybeCount(ImportanceHistogram prev) {