commit 9ccd3c5e12df350d56a04e55b06c153b1b0e3e76
author TreeHugger Robot <treehugger-gerrit@google.com> Tue Jun 01 21:00:19 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 01 21:00:19 2021 +0000
tree c8c70068a43ccea62ce07fa9ba1c86b833793aeb
parent d9463fbfdd0aa1730f14e3172ce9cecb898705e2
parent 4c29af3a6dc8f9b6b8eb431ba3ab60883238930a

Merge "Fixing deadlock when surface creation is waiting on surface destroy" into sc-dev

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

diff --git a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
index 8ca157b..e4f5539 100644
--- a/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
+++ b/src/com/android/launcher3/graphics/GridCustomizationsProvider.java
@@ -1,6 +1,7 @@
 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.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 @@
             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);