Merge "Move the AppRestrictionController dump out of the global AMS lock" into tm-dev (b2770cca) · Commits · e / os / android_frameworks_base

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

+11 −4

Original line number	Diff line number	Diff line
		@@ -9155,11 +9155,15 @@ public class ActivityManagerService extends IActivityManager.Stub
		}
		mComponentAliasResolver.dump(pw);
		}
		if (dumpAll) {
		}

		/**
		* Dump the app restriction controller, it's required not to hold the global lock here.
		*/
		private void dumpAppRestrictionController(PrintWriter pw) {
		pw.println("-------------------------------------------------------------------------------");
		mAppRestrictionController.dump(pw, "");
		}
		}

		/**
		* Wrapper function to print out debug data filtered by specified arguments.
		@@ -9514,6 +9518,9 @@ public class ActivityManagerService extends IActivityManager.Stub
		dumpNormalPriority, dumpAppId, false /* dumpProxies */);
		}
		}
		if (dumpAll) {
		dumpAppRestrictionController(pw);
		}
		}
		Binder.restoreCallingIdentity(origId);
		}