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

Commit 46c94b66 authored by Maunik Shah's avatar Maunik Shah Committed by Dianne Hackborn
Browse files

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

Fix for the synchronization issue leading to access of an array
Index out of bounds. Issue occurs due to race condition between
removing the activities of a crashed process from history stack
and resuming a separate activity.

Change-Id: I14bb5834e778c15b674248e46fe93b0ce9f37967
parent e0329cae

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;

    }

    }