Merge \\"Fixed whitelistManager assignment.\\" into nyc-dev am: dea7aa0da1 (df404d37) · Commits · e / os / android_frameworks_base

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -19307,6 +19307,7 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}

	boolean mayBeTop = false;		boolean mayBeTop = false;
			app.whitelistManager = false;

	for (int is = app.services.size()-1;		for (int is = app.services.size()-1;
	is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ		is >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
	@@ -19347,8 +19348,6 @@ public final class ActivityManagerService extends ActivityManagerNative
	}		}
	}		}

	app.whitelistManager = false;

	for (int conni = s.connections.size()-1;		for (int conni = s.connections.size()-1;
	conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ		conni >= 0 && (adj > ProcessList.FOREGROUND_APP_ADJ
	\|\| schedGroup == ProcessList.SCHED_GROUP_BACKGROUND		\|\| schedGroup == ProcessList.SCHED_GROUP_BACKGROUND