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

Commit 926327c0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Extra checks to find the source of flaky tests" into tm-dev am: 9cf0aa74 am: df1ca139 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18376662



Change-Id: I3d95a5f65303f674460d418096b531461420a359
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 847affd1 df1ca139

src/com/android/launcher3/model/BaseLoaderResults.java

+4 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ import com.android.launcher3.util.RunnableList; 
import java.util.ArrayList;

import java.util.Collections;

import java.util.List;

import java.util.Objects;

import java.util.concurrent.Executor;



/**
@@ -203,7 +204,9 @@ public abstract class BaseLoaderResults { 
        }



        private void bind() {

            IntSet currentScreenIds = mCallbacks.getPagesToBindSynchronously(mOrderedScreenIds);

            final IntSet currentScreenIds =

                    mCallbacks.getPagesToBindSynchronously(mOrderedScreenIds);

            Objects.requireNonNull(currentScreenIds, "Null screen ids provided by " + mCallbacks);



            // Separate the items that are on the current screen, and all the other remaining items

            ArrayList<ItemInfo> currentWorkspaceItems = new ArrayList<>();

src/com/android/launcher3/model/BgDataModel.java

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import android.text.TextUtils; 
import android.util.ArraySet;

import android.util.Log;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.LauncherSettings;
@@ -469,6 +470,7 @@ public class BgDataModel { 
         * or an empty IntSet

         * @param orderedScreenIds All the page ids to be bound

         */

        @NonNull

        default IntSet getPagesToBindSynchronously(IntArray orderedScreenIds) {

            return new IntSet();

        }

src/com/android/launcher3/model/ModelUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class ModelUtils { 
     * specified screen.

     */

    public static <T extends ItemInfo> void filterCurrentWorkspaceItems(

            IntSet currentScreenIds,

            final IntSet currentScreenIds,

            ArrayList<T> allWorkspaceItems,

            ArrayList<T> currentScreenItems,

            ArrayList<T> otherScreenItems) {