summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SettingsInitialize.java
diff options
context:
space:
mode:
authorTsung-Mao Fang <tmfang@google.com>2021-04-06 18:27:06 +0800
committerTsung-Mao Fang <tmfang@google.com>2021-04-06 18:27:06 +0800
commitebcabd9c07355eb1111fd7a7a780545ae02880a4 (patch)
tree6de4f80c68e05725c6b82e2e5ec2e53034748840 /src/com/android/settings/SettingsInitialize.java
parent20e610b6bdc3024e7e556026c06cd94b170ad828 (diff)
downloadpackages_apps_Settings-ebcabd9c07355eb1111fd7a7a780545ae02880a4.tar.gz
packages_apps_Settings-ebcabd9c07355eb1111fd7a7a780545ae02880a4.tar.bz2
packages_apps_Settings-ebcabd9c07355eb1111fd7a7a780545ae02880a4.zip
Fix ANR on ShorcutManager#getPinnedShortcuts
By design, ShorcutManager#getPinnedShortcuts is meant to called on a work thread. Fix: 183785618 Test: Switch the user profile, and function works properly. Change-Id: I87b8d3f57123ff12f83f95fc7f053b8840028ebe
Diffstat (limited to 'src/com/android/settings/SettingsInitialize.java')
-rw-r--r--src/com/android/settings/SettingsInitialize.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/settings/SettingsInitialize.java b/src/com/android/settings/SettingsInitialize.java
index 515703358e..cd949deca9 100644
--- a/src/com/android/settings/SettingsInitialize.java
+++ b/src/com/android/settings/SettingsInitialize.java
@@ -39,6 +39,7 @@ import android.util.Log;
import androidx.annotation.VisibleForTesting;
import com.android.settings.Settings.CreateShortcutActivity;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList;
import java.util.List;
@@ -62,7 +63,7 @@ public class SettingsInitialize extends BroadcastReceiver {
final PackageManager pm = context.getPackageManager();
managedProfileSetup(context, pm, broadcast, userInfo);
webviewSettingSetup(context, pm, userInfo);
- refreshExistingShortcuts(context);
+ ThreadUtils.postOnBackgroundThread(() -> refreshExistingShortcuts(context));
}
private void managedProfileSetup(Context context, final PackageManager pm, Intent broadcast,
@@ -142,5 +143,4 @@ public class SettingsInitialize extends BroadcastReceiver {
}
shortcutManager.updateShortcuts(updates);
}
-
}