Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a' into kraken

* commit 'ac24d23cd4a96f38b4e9cb0318a7c298794b9b6a':
  Don't bring up Launcher until after boot complete
This commit is contained in:
Christopher Tate
2010-06-07 18:48:27 -07:00
committed by Android Git Automerger
parent 0bc0a46ae8 ac24d23cd4
commit 8a7fa44fdc
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -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 {