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

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

Merge "Fixing deadlock when surface creation is waiting on surface destroy"... 

Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev am: 9ccd3c5e

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

Change-Id: Ifbfcb12c653035489552644e3afe4f524ee69c23
parents 25bf26ff 9ccd3c5e

src/com/android/launcher3/graphics/GridCustomizationsProvider.java

+3 −2
Original line number Diff line number Diff line 
package com.android.launcher3.graphics;



import static com.android.launcher3.Utilities.getPrefs;

import static com.android.launcher3.util.Executors.UI_HELPER_EXECUTOR;

import static com.android.launcher3.util.Themes.KEY_THEMED_ICONS;

import static com.android.launcher3.util.Themes.isThemedIconEnabled;
@@ -18,7 +19,6 @@ import android.os.Bundle; 
import android.os.Handler;

import android.os.IBinder;

import android.os.IBinder.DeathRecipient;

import android.os.Looper;

import android.os.Message;

import android.os.Messenger;

import android.util.ArrayMap;
@@ -217,7 +217,8 @@ public class GridCustomizationsProvider extends ContentProvider { 
            Bundle result = new Bundle();

            result.putParcelable(KEY_SURFACE_PACKAGE, renderer.getSurfacePackage());



            Messenger messenger = new Messenger(new Handler(Looper.getMainLooper(), observer));

            Messenger messenger =

                    new Messenger(new Handler(UI_HELPER_EXECUTOR.getLooper(), observer));

            Message msg = Message.obtain();

            msg.replyTo = messenger;

            result.putParcelable(KEY_CALLBACK, msg);