Merge "Disable freezer during AM provider/service dump" into udc-dev (8b5f672c) · Commits · e / os / android_frameworks_base

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

+34 −29

Original line number	Diff line number	Diff line
		@@ -7258,6 +7258,8 @@ public final class ActiveServices {
		*/
		protected boolean dumpService(FileDescriptor fd, PrintWriter pw, String name, int[] users,
		String[] args, int opti, boolean dumpAll) {
		try {
		mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);
		final ArrayList<ServiceRecord> services = new ArrayList<>();

		final Predicate<ServiceRecord> filter = DumpUtils.filterRecord(name);
		@@ -7299,6 +7301,9 @@ public final class ActiveServices {
		dumpService("", fd, pw, services.get(i), args, dumpAll);
		}
		return true;
		} finally {
		mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}

		/**

+16 −11

Original line number	Diff line number	Diff line
		@@ -351,6 +351,8 @@ public final class ProviderMap {

		protected boolean dumpProvider(FileDescriptor fd, PrintWriter pw, String name, String[] args,
		int opti, boolean dumpAll) {
		try {
		mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(false);
		ArrayList<ContentProviderRecord> providers = getProvidersForName(name);

		if (providers.size() <= 0) {
		@@ -366,6 +368,9 @@ public final class ProviderMap {
		dumpProvider("", fd, pw, providers.get(i), args, dumpAll);
		}
		return true;
		} finally {
		mAm.mOomAdjuster.mCachedAppOptimizer.enableFreezer(true);
		}
		}

		/**