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

Commit 24e69d07 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing potential ANR when fetching for wallpaper info" into tm-dev am: 2b80d6f8 

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



Change-Id: I16eefe0ec4cce1e3e486b44963a451327da2d6bb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6dcc74b1 2b80d6f8

src/com/android/launcher3/util/WallpaperOffsetInterpolator.java

+9 −3
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ import android.os.SystemClock; 
import android.util.Log;

import android.view.animation.Interpolator;



import androidx.annotation.AnyThread;



import com.android.launcher3.Utilities;

import com.android.launcher3.Workspace;

import com.android.launcher3.anim.Interpolators;
@@ -182,6 +184,7 @@ public class WallpaperOffsetInterpolator extends BroadcastReceiver { 
        }

    }



    @AnyThread

    private void updateOffset() {

        Message.obtain(mHandler, MSG_SET_NUM_PARALLAX, getNumPagesForWallpaperParallax(), 0,

                mWindowToken).sendToTarget();
@@ -206,9 +209,12 @@ public class WallpaperOffsetInterpolator extends BroadcastReceiver { 


    @Override

    public void onReceive(Context context, Intent intent) {

        UI_HELPER_EXECUTOR.execute(() -> {

            // Updating the boolean on a background thread is fine as the assignments are atomic

            mWallpaperIsLiveWallpaper =

                WallpaperManager.getInstance(mWorkspace.getContext()).getWallpaperInfo() != null;

                    WallpaperManager.getInstance(context).getWallpaperInfo() != null;

            updateOffset();

        });

    }



    private static final int MSG_START_ANIMATION = 1;