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

resolved conflicts for merge of 409b7120 to master

Browse Source 
Change-Id: I1741e205b5ff5ae62a38ab3b096bcc3d96883538
This commit is contained in:
Dianne Hackborn
2010-08-27 12:04:26 -07:00
parent 1040dc465c 409b71201a
commit 41bfa37cb2
6 changed files with 41 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/java/com/android/server/am/ActivityStack.java
View File

@@ -504,7 +504,7 @@ public class ActivityStack {
r.info, r.icicle, results, newIntents, !andResume,
mService.isNextTransitionForward());
if ((app.info.flags&ApplicationInfo.FLAG_HEAVY_WEIGHT) != 0) {
if ((app.info.flags&ApplicationInfo.CANT_SAVE_STATE) != 0) {
// This may be a heavy-weight process! Note that the package
// manager will ensure that only activity can run in the main
// process of the .apk, which is the only thing that will be
@@ -2404,7 +2404,7 @@ public class ActivityStack {
final long origId = Binder.clearCallingIdentity();
if (mMainStack && aInfo != null &&
(aInfo.applicationInfo.flags&ApplicationInfo.FLAG_HEAVY_WEIGHT) != 0) {
(aInfo.applicationInfo.flags&ApplicationInfo.CANT_SAVE_STATE) != 0) {
// This may be a heavy-weight process! Check to see if we already
// have another, different heavy-weight process running.
if (aInfo.processName.equals(aInfo.applicationInfo.packageName)) {