Merge "Fix ANR on ShorcutManager#getPinnedShortcuts" into sc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
82b44b24cf
@@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user