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

Commit 8c10c286 authored by Rubin Xu's avatar Rubin Xu Committed by Android (Google) Code Review
Browse files

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

parents a41ff540 17d08f47

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 {