Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17d08f47 authored by Rubin Xu's avatar Rubin Xu
Browse files

Do not compare ID when deduplicating SecurityEvent 

Two SecurityEvents should be considered identical as long as
their event content equals, disregarding the id field.

Test: manual
Change-Id: I811f9a104ed3a0d9e02991aeb9e3653c5c02efc3
Fix: 132367517
parent 9ff409c7

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

+5 −0
Original line number Diff line number Diff line
@@ -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

+1 −1
Original line number Diff line number Diff line
@@ -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 {