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

Commit 8d25fba8 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race... 

Merge "DO NOT MERGE. Framework/base: Added synchronization block to avoid race condition" into jb-mr2-dev
parents ed8f94fc 46c94b66

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;

    }

    }