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

Commit 1895addc authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge \"Use getActivityToken() instead of mToken in isTopOfTask\" into nyc-dev 

am: 723e5afa

Change-Id: I12f294f42e135fc181f585c515cd9ad4589ac1f2
parents 9d178342 723e5afa

core/java/android/app/Activity.java

+1 −1
Original line number Diff line number Diff line
@@ -5952,7 +5952,7 @@ public class Activity extends ContextThemeWrapper 
            return false;

        }

        try {

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

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

        } catch (RemoteException e) {

            return false;

        }