Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev (82b44b24) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsInitialize.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);
		}

		}