Merge "Make sure we start new activity only in UI thread." into tm-qpr-dev am: fd2471b990 am: 52f3078c7f

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

Change-Id: Idd5019c6f5f95219ac13cc70b2e4842dbac70392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-02-21 22:46:45 +00:00
committed by Automerger Merge Worker

View File

@@ -313,7 +313,7 @@ public interface ActivityContext {
*/
default boolean startActivitySafely(
View v, Intent intent, @Nullable ItemInfo item) {
Preconditions.assertUIThread();
Context context = (Context) this;
if (isAppBlockedForSafeMode() && !PackageManagerHelper.isSystemApp(context, intent)) {
Toast.makeText(context, R.string.safemode_shortcut_error, Toast.LENGTH_SHORT).show();