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

Commit 9c8f6e98 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Allow simultaneous timestamp not considered as inWindow" into tm-dev

parents 54821d5c 66b81b76

src/java/com/android/internal/telephony/SlidingWindowEventCounter.java

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class SlidingWindowEventCounter { 
    public synchronized boolean isInWindow() {

        return (mTimestampQueueMillis.size() == mNumOccurrences)

                && mTimestampQueueMillis.peekFirst()

                + mWindowSizeMillis >= mTimestampQueueMillis.peekLast();

                + mWindowSizeMillis > mTimestampQueueMillis.peekLast();

    }



    @VisibleForTesting

tests/telephonytests/src/com/android/internal/telephony/SlidingWindowEventCounterTest.java

+3 −2
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ public class SlidingWindowEventCounterTest { 
        counter = new SlidingWindowEventCounter(0, 2);

        counter.addOccurrence(mInitialTime);

        counter.addOccurrence(mInitialTime);

        assertTrue(counter.isInWindow());

        assertFalse(counter.addOccurrence(mInitialTime + 1));

        assertFalse(counter.isInWindow());

        assertFalse(counter.addOccurrence(mInitialTime));

        assertFalse(counter.addOccurrence(mInitialTime));

    }

}