Merge "Fix some oom tuning and display size stuff." (6077115d) · Commits · e / os / android_frameworks_base

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

+48 −13

Original line number	Diff line number	Diff line
		@@ -10295,6 +10295,22 @@ public final class ActivityManagerService extends ActivityManagerNative
		return needSep;
		}

		void printOomLevel(PrintWriter pw, String name, int adj) {
		pw.print(" ");
		if (adj >= 0) {
		pw.print(' ');
		if (adj < 10) pw.print(' ');
		} else {
		if (adj > -10) pw.print(' ');
		}
		pw.print(adj);
		pw.print(": ");
		pw.print(name);
		pw.print(" (");
		pw.print(mProcessList.getMemLevel(adj)/1024);
		pw.println(" kB)");
		}

		boolean dumpOomLocked(FileDescriptor fd, PrintWriter pw, String[] args,
		int opti, boolean dumpAll) {
		boolean needSep = false;
		@@ -10303,19 +10319,19 @@ public final class ActivityManagerService extends ActivityManagerNative
		if (needSep) pw.println();
		needSep = true;
		pw.println(" OOM levels:");
		pw.print(" SYSTEM_ADJ: "); pw.println(ProcessList.SYSTEM_ADJ);
		pw.print(" PERSISTENT_PROC_ADJ: "); pw.println(ProcessList.PERSISTENT_PROC_ADJ);
		pw.print(" FOREGROUND_APP_ADJ: "); pw.println(ProcessList.FOREGROUND_APP_ADJ);
		pw.print(" VISIBLE_APP_ADJ: "); pw.println(ProcessList.VISIBLE_APP_ADJ);
		pw.print(" PERCEPTIBLE_APP_ADJ: "); pw.println(ProcessList.PERCEPTIBLE_APP_ADJ);
		pw.print(" BACKUP_APP_ADJ: "); pw.println(ProcessList.BACKUP_APP_ADJ);
		pw.print(" HEAVY_WEIGHT_APP_ADJ: "); pw.println(ProcessList.HEAVY_WEIGHT_APP_ADJ);
		pw.print(" SERVICE_ADJ: "); pw.println(ProcessList.SERVICE_ADJ);
		pw.print(" HOME_APP_ADJ: "); pw.println(ProcessList.HOME_APP_ADJ);
		pw.print(" PREVIOUS_APP_ADJ: "); pw.println(ProcessList.PREVIOUS_APP_ADJ);
		pw.print(" SERVICE_B_ADJ: "); pw.println(ProcessList.SERVICE_B_ADJ);
		pw.print(" CACHED_APP_MIN_ADJ: "); pw.println(ProcessList.CACHED_APP_MIN_ADJ);
		pw.print(" CACHED_APP_MAX_ADJ: "); pw.println(ProcessList.CACHED_APP_MAX_ADJ);
		printOomLevel(pw, "SYSTEM_ADJ", ProcessList.SYSTEM_ADJ);
		printOomLevel(pw, "PERSISTENT_PROC_ADJ", ProcessList.PERSISTENT_PROC_ADJ);
		printOomLevel(pw, "FOREGROUND_APP_ADJ", ProcessList.FOREGROUND_APP_ADJ);
		printOomLevel(pw, "VISIBLE_APP_ADJ", ProcessList.VISIBLE_APP_ADJ);
		printOomLevel(pw, "PERCEPTIBLE_APP_ADJ", ProcessList.PERCEPTIBLE_APP_ADJ);
		printOomLevel(pw, "BACKUP_APP_ADJ", ProcessList.BACKUP_APP_ADJ);
		printOomLevel(pw, "HEAVY_WEIGHT_APP_ADJ", ProcessList.HEAVY_WEIGHT_APP_ADJ);
		printOomLevel(pw, "SERVICE_ADJ", ProcessList.SERVICE_ADJ);
		printOomLevel(pw, "HOME_APP_ADJ", ProcessList.HOME_APP_ADJ);
		printOomLevel(pw, "PREVIOUS_APP_ADJ", ProcessList.PREVIOUS_APP_ADJ);
		printOomLevel(pw, "SERVICE_B_ADJ", ProcessList.SERVICE_B_ADJ);
		printOomLevel(pw, "CACHED_APP_MIN_ADJ", ProcessList.CACHED_APP_MIN_ADJ);
		printOomLevel(pw, "CACHED_APP_MAX_ADJ", ProcessList.CACHED_APP_MAX_ADJ);

		if (needSep) pw.println();
		needSep = true;
		@@ -11515,10 +11531,29 @@ public final class ActivityManagerService extends ActivityManagerNative
		pw.print(" "); pw.print(unshared); pw.print(" kB unshared; ");
		pw.print(voltile); pw.println(" kB volatile");
		}
		pw.print(" TUNING: ");
		pw.print(mProcessList.getMemLevel(ProcessList.CACHED_APP_MAX_ADJ)/1024);
		pw.print(" kB");
		if (ActivityManager.isLowRamDeviceStatic()) {
		pw.print(" (low-ram)");
		}
		if (ActivityManager.isHighEndGfx()) {
		pw.print(" (high-end-gfx)");
		}
		pw.println();
		} else {
		pw.print("ksm,"); pw.print(sharing); pw.print(",");
		pw.print(shared); pw.print(","); pw.print(unshared); pw.print(",");
		pw.println(voltile);
		pw.print("tuning,");
		pw.print(mProcessList.getMemLevel(ProcessList.CACHED_APP_MAX_ADJ)/1024);
		if (ActivityManager.isLowRamDeviceStatic()) {
		pw.print(",low-ram");
		}
		if (ActivityManager.isHighEndGfx()) {
		pw.print(",high-end-gfx");
		}
		pw.println();
		}
		}
		}

services/java/com/android/server/am/ProcessList.java

+13 −4

Original line number	Diff line number	Diff line
		@@ -194,10 +194,14 @@ final class ProcessList {
		float scaleMem = ((float)(mTotalMemMb-300))/(700-300);

		// Scale buckets from screen size.
		int minSize = 320*480; // 153600
		int minSize = 480*800; // 384000
		int maxSize = 1280*800; // 1024000 230400 870400 .264
		float scaleDisp = ((float)(displayWidth*displayHeight)-minSize)/(maxSize-minSize);
		//Slog.i("XXXXXX", "scaleDisp=" + scaleDisp + " dw=" + displayWidth + " dh=" + displayHeight);
		if (false) {
		Slog.i("XXXXXX", "scaleMem=" + scaleMem);
		Slog.i("XXXXXX", "scaleDisp=" + scaleDisp + " dw=" + displayWidth
		+ " dh=" + displayHeight);
		}

		StringBuilder adjString = new StringBuilder();
		StringBuilder memString = new StringBuilder();
		@@ -205,8 +209,13 @@ final class ProcessList {
		float scale = scaleMem > scaleDisp ? scaleMem : scaleDisp;
		if (scale < 0) scale = 0;
		else if (scale > 1) scale = 1;
		int minfree_adj = Resources.getSystem().getInteger(com.android.internal.R.integer.config_lowMemoryKillerMinFreeKbytesAdjust);
		int minfree_abs = Resources.getSystem().getInteger(com.android.internal.R.integer.config_lowMemoryKillerMinFreeKbytesAbsolute);
		int minfree_adj = Resources.getSystem().getInteger(
		com.android.internal.R.integer.config_lowMemoryKillerMinFreeKbytesAdjust);
		int minfree_abs = Resources.getSystem().getInteger(
		com.android.internal.R.integer.config_lowMemoryKillerMinFreeKbytesAbsolute);
		if (false) {
		Slog.i("XXXXXX", "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs);
		}

		for (int i=0; i<mOomAdj.length; i++) {
		long low = mOomMinFreeLow[i];

services/java/com/android/server/wm/WindowManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -7637,7 +7637,7 @@ public class WindowManagerService extends IWindowManager.Stub
		private void readForcedDisplaySizeAndDensityLocked(final DisplayContent displayContent) {
		String sizeStr = Settings.Global.getString(mContext.getContentResolver(),
		Settings.Global.DISPLAY_SIZE_FORCED);
		if (sizeStr == null) {
		if (sizeStr == null \|\| sizeStr.length() == 0) {
		sizeStr = SystemProperties.get(SIZE_OVERRIDE, null);
		}
		if (sizeStr != null && sizeStr.length() > 0) {
		@@ -7661,7 +7661,7 @@ public class WindowManagerService extends IWindowManager.Stub
		}
		String densityStr = Settings.Global.getString(mContext.getContentResolver(),
		Settings.Global.DISPLAY_DENSITY_FORCED);
		if (densityStr == null) {
		if (densityStr == null \|\| densityStr.length() == 0) {
		densityStr = SystemProperties.get(DENSITY_OVERRIDE, null);
		}
		if (densityStr != null && densityStr.length() > 0) {