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

Commit 0d935a2c authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

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

Merge "Merge "Do not compare ID when deduplicating SecurityEvent" into qt-dev am: 8c10c286 am: 870c6e84" into qt-r1-dev-plus-aosp
parents e7285b84 15fcca9c

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 {