Merge "Check activity start result code to properly return whther startActivityFromRecents was successful." into tm-qpr-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
5cc7eec00a
@@ -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_LOCKED;
|
||||||
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
|
import static android.app.ActivityManager.LOCK_TASK_MODE_NONE;
|
||||||
import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
|
import static android.app.ActivityManager.LOCK_TASK_MODE_PINNED;
|
||||||
import static android.app.ActivityManager.RECENT_IGNORE_UNAVAILABLE;
|
|
||||||
import static android.app.ActivityTaskManager.getService;
|
import static android.app.ActivityTaskManager.getService;
|
||||||
|
|
||||||
import android.annotation.NonNull;
|
import android.annotation.NonNull;
|
||||||
@@ -27,7 +26,6 @@ import android.annotation.Nullable;
|
|||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.app.ActivityClient;
|
import android.app.ActivityClient;
|
||||||
import android.app.ActivityManager;
|
import android.app.ActivityManager;
|
||||||
import android.app.ActivityManager.RecentTaskInfo;
|
|
||||||
import android.app.ActivityManager.RunningTaskInfo;
|
import android.app.ActivityManager.RunningTaskInfo;
|
||||||
import android.app.ActivityOptions;
|
import android.app.ActivityOptions;
|
||||||
import android.app.ActivityTaskManager;
|
import android.app.ActivityTaskManager;
|
||||||
@@ -252,8 +250,9 @@ public class ActivityManagerWrapper {
|
|||||||
public boolean startActivityFromRecents(int taskId, ActivityOptions options) {
|
public boolean startActivityFromRecents(int taskId, ActivityOptions options) {
|
||||||
try {
|
try {
|
||||||
Bundle optsBundle = options == null ? null : options.toBundle();
|
Bundle optsBundle = options == null ? null : options.toBundle();
|
||||||
getService().startActivityFromRecents(taskId, optsBundle);
|
return ActivityManager.isStartResultSuccessful(
|
||||||
return true;
|
getService().startActivityFromRecents(
|
||||||
|
taskId, optsBundle));
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user