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

Commit 8a7fa44f authored by Christopher Tate's avatar Christopher Tate Committed by Android Git Automerger
Browse files

am ac24d23c: Merge "Don\'t bring up Launcher until after boot complete" into froyo 

Merge commit 'ac24d23c' into kraken

* commit 'ac24d23c':
  Don't bring up Launcher until after boot complete
parents 0bc0a46a ac24d23c

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -5788,7 +5788,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen 
















        // See if the top visible activity is waiting to run in this process...







        // See if the top visible activity is waiting to run in this process...











        HistoryRecord hr = topRunningActivityLocked(null);







        HistoryRecord hr = topRunningActivityLocked(null);











        if (hr != null) {







        if (hr != null && normalMode) {











            if (hr.app == null && app.info.uid == hr.info.applicationInfo.uid







            if (hr.app == null && app.info.uid == hr.info.applicationInfo.uid











                    && processName.equals(hr.processName)) {







                    && processName.equals(hr.processName)) {











                try {







                try {