Merge "Fix issue #35365651: ActivityManager.getPackageImportance() doesn't..." (5603a16e) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -3911,8 +3911,9 @@ package android.app {
		method public void readFromParcel(android.os.Parcel);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningAppProcessInfo> CREATOR;
		field public static final int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final deprecated int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_CACHED = 400; // 0x190
		field public static final deprecated int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final int IMPORTANCE_FOREGROUND = 100; // 0x64
		field public static final int IMPORTANCE_FOREGROUND_SERVICE = 125; // 0x7d
		field public static final int IMPORTANCE_GONE = 1000; // 0x3e8

api/system-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -4049,8 +4049,9 @@ package android.app {
		method public void readFromParcel(android.os.Parcel);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningAppProcessInfo> CREATOR;
		field public static final int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final deprecated int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_CACHED = 400; // 0x190
		field public static final deprecated int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final int IMPORTANCE_FOREGROUND = 100; // 0x64
		field public static final int IMPORTANCE_FOREGROUND_SERVICE = 125; // 0x7d
		field public static final int IMPORTANCE_GONE = 1000; // 0x3e8

api/test-current.txt

+3 −2

Original line number	Diff line number	Diff line
		@@ -3920,8 +3920,9 @@ package android.app {
		method public void readFromParcel(android.os.Parcel);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.ActivityManager.RunningAppProcessInfo> CREATOR;
		field public static final int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final deprecated int IMPORTANCE_BACKGROUND = 400; // 0x190
		field public static final int IMPORTANCE_CACHED = 400; // 0x190
		field public static final deprecated int IMPORTANCE_EMPTY = 500; // 0x1f4
		field public static final int IMPORTANCE_FOREGROUND = 100; // 0x64
		field public static final int IMPORTANCE_FOREGROUND_SERVICE = 125; // 0x7d
		field public static final int IMPORTANCE_GONE = 1000; // 0x3e8

core/java/android/app/ActivityManager.java

+15 −7

Original line number	Diff line number	Diff line
		@@ -3024,14 +3024,22 @@ public class ActivityManager {

		/**
		* Constant for {@link #importance}: This process process contains
		* background code that is expendable.
		* cached code that is expendable, not actively running any app components
		* we care about.
		*/
		public static final int IMPORTANCE_BACKGROUND = 400;
		public static final int IMPORTANCE_CACHED = 400;

		/**
		* @deprecated Renamed to {@link #IMPORTANCE_CACHED}.
		*/
		public static final int IMPORTANCE_BACKGROUND = IMPORTANCE_CACHED;

		/**
		* Constant for {@link #importance}: This process is empty of any
		* actively running code.
		* @deprecated This value is no longer reported, use {@link #IMPORTANCE_CACHED} instead.
		*/
		@Deprecated
		public static final int IMPORTANCE_EMPTY = 500;

		/**
		@@ -3044,7 +3052,7 @@ public class ActivityManager {
		if (procState == PROCESS_STATE_NONEXISTENT) {
		return IMPORTANCE_GONE;
		} else if (procState >= PROCESS_STATE_HOME) {
		return IMPORTANCE_BACKGROUND;
		return IMPORTANCE_CACHED;
		} else if (procState >= PROCESS_STATE_SERVICE) {
		return IMPORTANCE_SERVICE;
		} else if (procState > PROCESS_STATE_HEAVY_WEIGHT) {
		@@ -3066,7 +3074,7 @@ public class ActivityManager {
		public static int importanceToProcState(int importance) {
		if (importance == IMPORTANCE_GONE) {
		return PROCESS_STATE_NONEXISTENT;
		} else if (importance >= IMPORTANCE_BACKGROUND) {
		} else if (importance >= IMPORTANCE_CACHED) {
		return PROCESS_STATE_HOME;
		} else if (importance >= IMPORTANCE_SERVICE) {
		return PROCESS_STATE_SERVICE;
		@@ -3088,8 +3096,8 @@ public class ActivityManager {
		/**
		* The relative importance level that the system places on this
		* process. May be one of {@link #IMPORTANCE_FOREGROUND},
		* {@link #IMPORTANCE_VISIBLE}, {@link #IMPORTANCE_SERVICE},
		* {@link #IMPORTANCE_BACKGROUND}, or {@link #IMPORTANCE_EMPTY}. These
		* {@link #IMPORTANCE_VISIBLE}, {@link #IMPORTANCE_SERVICE}, or
		* {@link #IMPORTANCE_CACHED}. These
		* constants are numbered so that "more important" values are always
		* smaller than "less important" values.
		*/
		@@ -3101,7 +3109,7 @@ public class ActivityManager {
		* utility of processes within a category. This number means nothing
		* except that a smaller values are more recently used (and thus
		* more important). Currently an LRU value is only maintained for
		* the {@link #IMPORTANCE_BACKGROUND} category, though others may
		* the {@link #IMPORTANCE_CACHED} category, though others may
		* be maintained in the future.
		*/
		public int lru;

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

+3 −7

Original line number	Diff line number	Diff line
		@@ -4157,13 +4157,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		synchronized (this) {
		for (int i=mLruProcesses.size()-1; i>=0; i--) {
		final ProcessRecord proc = mLruProcesses.get(i);
		if (procState == ActivityManager.PROCESS_STATE_NONEXISTENT
		\|\| procState > proc.setProcState) {
		if (proc.pkgList.containsKey(packageName)) {
		procState = proc.setProcState;
		break;
		}
		if (proc.pkgDeps != null && proc.pkgDeps.contains(packageName)) {
		if (procState > proc.setProcState) {
		if (proc.pkgList.containsKey(packageName) \|\|
		(proc.pkgDeps != null && proc.pkgDeps.contains(packageName))) {
		procState = proc.setProcState;
		}
		}