resolved conflicts for merge of 3d7d3690 to master (004abb12) · Commits · e / os / android_frameworks_base

api/current.xml

+0 −21

Original line number	Diff line number	Diff line
		@@ -25184,17 +25184,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"
		@@ -25305,16 +25294,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"

+7 −4

Original line number	Diff line number	Diff line
		@@ -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;

+1 −1

Original line number	Diff line number	Diff line
		@@ -6858,7 +6858,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) {