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

Commit d029f12e authored by Josh Tsuji's avatar Josh Tsuji
Browse files

Remove unnecessary use of iterators; this is already operating on a copy. 

Bug: 341400177
Flag: EXEMPT should be no-op refactor
Test: atest SystemUITests
Change-Id: I942a7e19a0415b276c38e23d717b38c5569bca3f
parent c3e2c0d0

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+5 −7
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ import com.android.keyguard.ViewMediatorCallback; 
import com.android.keyguard.mediator.ScreenOnCoordinator;

import com.android.systemui.CoreStartable;

import com.android.systemui.DejankUtils;

import com.android.systemui.Dumpable;

import com.android.systemui.EventLogTags;

import com.android.systemui.animation.ActivityTransitionAnimator;

import com.android.systemui.animation.TransitionAnimator;
@@ -194,7 +193,6 @@ import java.lang.annotation.Retention; 
import java.lang.annotation.RetentionPolicy;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Iterator;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.Executor;
@@ -4129,14 +4127,14 @@ public class KeyguardViewMediator implements CoreStartable, 


    private void notifyLockNowCallback() {

        List<LockNowCallback> callbacks;



        synchronized (mLockNowCallbacks) {

            callbacks = new ArrayList<LockNowCallback>(mLockNowCallbacks);

            callbacks = new ArrayList<>(mLockNowCallbacks);

            mLockNowCallbacks.clear();

        }

        Iterator<LockNowCallback> iter = callbacks.listIterator();

        while (iter.hasNext()) {

            LockNowCallback callback = iter.next();

            iter.remove();



        for (int i = 0; i < callbacks.size(); i++) {

            final LockNowCallback callback = callbacks.get(i);

            if (callback.mUserId != mSelectedUserInteractor.getSelectedUserId()) {

                Log.i(TAG, "Not notifying lockNowCallback due to user mismatch");

                continue;

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardServiceShowLockscreenInteractor.kt

+3 −5
Original line number Diff line number Diff line
@@ -139,18 +139,16 @@ constructor( 
    /** Notifies the callbacks that we've either locked, or decided not to lock. */

    private fun notifyShowLockscreenCallbacks() {

        var callbacks: MutableList<ShowLockscreenCallback>



        synchronized(repository.showLockscreenCallbacks) {

            callbacks = ArrayList(repository.showLockscreenCallbacks)

            repository.showLockscreenCallbacks.clear()

        }



        val iter: MutableIterator<ShowLockscreenCallback> = callbacks.listIterator()

        while (iter.hasNext()) {

            val callback = iter.next()

            iter.remove()

        callbacks.forEach { callback ->

            if (callback.userId != selectedUserInteractor.getSelectedUserId()) {

                Log.i(TAG, "Not notifying lockNowCallback due to user mismatch")

                continue

                return

            }

            Log.i(TAG, "Notifying lockNowCallback")

            try {