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

Commit d9246f1e authored by Rubin Xu's avatar Rubin Xu Committed by android-build-merger
Browse files

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

am: 8c10c286

Change-Id: Ia04f7841f89a911acf488b28a0434bb3595c4042
parents 557b615e 8c10c286

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 {