Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b6ab21 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check activity start result code to properly return whther... 

Merge "Check activity start result code to properly return whther startActivityFromRecents was successful." into tm-qpr-dev am: 5cc7eec0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20141833



Change-Id: I3a68ff4c28ce6aab6f818a5310178c4cb327b119
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c7edee1c 5cc7eec0

packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityManagerWrapper.java

+3 −4
Original line number Diff line number Diff line
@@ -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;

        }