Merge "Do not compare ID when deduplicating SecurityEvent" into qt-dev

core/java/android/app/admin/SecurityLog.java

@@ -636,6 +636,11 @@ public class SecurityLog {
         public int hashCode() {
             return Objects.hash(mEvent, mId);
         }
+
+        /** @hide */
+        public boolean eventEquals(SecurityEvent other) {
+            return other != null && mEvent.equals(other.mEvent);
+        }
     }
     /**
      * Retrieve all security logs and return immediately.

services/devicepolicy/java/com/android/server/devicepolicy/SecurityLogMonitor.java

@@ -349,7 +349,7 @@ class SecurityLogMonitor implements Runnable {
                 lastPos++;
             } else {
                 // Two events have the same timestamp, check if they are the same.
-                if (lastEvent.equals(curEvent)) {
+                if (lastEvent.eventEquals(curEvent)) {
                     // Actual overlap, just skip the event.
                     if (DEBUG) Slog.d(TAG, "Skipped dup event with timestamp: " + lastNanos);
                 } else {