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

Commit 5f938362 authored by George Mount's avatar George Mount Committed by android-build-merger
Browse files

Merge "Ensure window has been added in isTopOfTask" into nyc-dev am: e6ef0f9d 

am: 5659056d

* commit '5659056d':
  Ensure window has been added in isTopOfTask

Change-Id: I829ba9daaa5caa547985e90a1d1a5a2e1bd51a31
parents 0d018cd3 5659056d

core/java/android/app/Activity.java

+3 −0
Original line number Diff line number Diff line
@@ -5925,6 +5925,9 @@ public class Activity extends ContextThemeWrapper 
     * @return true if this is the topmost, non-finishing activity in its task.

     */

    private boolean isTopOfTask() {

        if (mToken == null || mWindow == null || !mWindowAdded) {

            return false;

        }

        try {

            return ActivityManagerNative.getDefault().isTopOfTask(mToken);

        } catch (RemoteException e) {