From e48a269ca295571bd5da2efa07fcc6c1f0de9fde Mon Sep 17 00:00:00 2001 From: Schneider Victor-tulias Date: Fri, 7 Oct 2022 15:18:25 -0700 Subject: [PATCH] Check activity start result code to properly return whther startActivityFromRecents was successful. Launcher was not properly giving the user an error message when an activity failed to launch from recents. Added a result code check. Bug: 240373119 Test: Manually repro'd bug and checked logs Change-Id: I12e299077b51b27c4e3f477a0a7440f0502fee39 --- .../systemui/shared/system/ActivityManagerWrapper.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java index 916526d0efac6..ce337bb70e5be 100644 --- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java +++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java @@ -19,7 +19,6 @@ package com.android.systemui.shared.system; import static android.app.ActivityManager.LOCK_TASK_MODE_LOCKED; import static android.app.ActivityManager.LOCK_TASK_MODE_NONE; import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED; -import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE; import static android.app.ActivityTaskManager.getService; import android.annotation.NonNull; @@ -27,7 +26,6 @@ import android.annotation.Nullable; import android.app.Activity; import android.app.ActivityClient; import android.app.ActivityManager; -import android.app.ActivityManager.RecentTaskInfo; import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityOptions; import android.app.ActivityTaskManager; @@ -252,8 +250,9 @@ public class ActivityManagerWrapper { public boolean startActivityFromRecents(int taskId, ActivityOptions options) { try { Bundle optsBundle = options == null ? null : options.toBundle(); - getService().startActivityFromRecents(taskId, optsBundle); - return true; + return ActivityManager.isStartResultSuccessful( + getService().startActivityFromRecents( + taskId, optsBundle)); } catch (Exception e) { return false; }