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

am e25b4bc7: Merge "These are not ready to be exposed. Also rename them to be better." into gingerbread

Browse Source 
Merge commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99' into gingerbread-plus-aosp

* commit 'e25b4bc76fef584b38ce4e72f919fba119bdfa99':
  These are not ready to be exposed.  Also rename them to be better.
This commit is contained in:
Dianne Hackborn
2010-09-03 13:26:30 -07:00
committed by Android Git Automerger
parent bfbf84b726 e25b4bc76f
commit 3d7d3690de
3 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
api/current.xml
View File

@@ -21704,17 +21704,6 @@
visibility="public"
>
</field>
<field name="FLAG_HEAVY_WEIGHT"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="IMPORTANCE_BACKGROUND"
type="int"
transient="false"
@@ -21825,16 +21814,6 @@
visibility="public"
>
</field>
<field name="flags"
type="int"
transient="false"
volatile="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="importance"
type="int"
transient="false"

11
core/java/android/app/ActivityManager.java
View File

@@ -755,14 +755,17 @@ public class ActivityManager {
public String pkgList[];
/**
* Constant for {@link #flags}: this is a heavy-weight process,
* meaning it will not be killed while in the background.
* Constant for {@link #flags}: this is an app that is unable to
* correctly save its state when going to the background,
* so it can not be killed while in the background.
* @hide
*/
public static final int FLAG_HEAVY_WEIGHT = 1<<0;
public static final int FLAG_CANT_SAVE_STATE = 1<<0;
/**
* Flags of information. May be any of
* {@link #FLAG_HEAVY_WEIGHT}.
* {@link #FLAG_CANT_SAVE_STATE}.
* @hide
*/
public int flags;

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

@@ -6825,7 +6825,7 @@ public final class ActivityManagerService extends ActivityManagerNative implemen
app.pid, app.getPackageList());
currApp.uid = app.info.uid;
if (mHeavyWeightProcess == app) {
currApp.flags |= ActivityManager.RunningAppProcessInfo.FLAG_HEAVY_WEIGHT;
currApp.flags |= ActivityManager.RunningAppProcessInfo.FLAG_CANT_SAVE_STATE;
}
int adj = app.curAdj;
if (adj >= EMPTY_APP_ADJ) {