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

Commit 5659056d 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

* commit 'e6ef0f9d':
  Ensure window has been added in isTopOfTask

Change-Id: I16c17d62a344f4fcf71b817ab2228b13261aae7e
parents 3bed2e9a e6ef0f9d

core/java/android/app/Activity.java

+3 −0
Original line number Diff line number Diff line
@@ -5920,6 +5920,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) {