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

Commit d031f9c7 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block... 

am 087384b0: am f3251033: Merge "Framework/base: Added synchronization block to avoid race condition"

* commit '087384b0':
  Framework/base: Added synchronization block to avoid race condition
parents 03367e29 087384b0

services/java/com/android/server/am/ActivityStack.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -3655,8 +3655,10 @@ final class ActivityStack { 
        }

        }





        if (activityRemoved) {

        if (activityRemoved) {

            synchronized (mService) {

                resumeTopActivityLocked(null);

                resumeTopActivityLocked(null);

            }

            }

        }





        return res;

        return res;

    }

    }