Merge "Add null check to cleanupRecentTasksLocked." into lmp-dev (b655e756) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3816,6 +3816,11 @@ public final class ActivityManagerService extends ActivityManagerNative
	* of affiliations.		* of affiliations.
	*/		*/
	void cleanupRecentTasksLocked(int userId) {		void cleanupRecentTasksLocked(int userId) {
			if (mRecentTasks == null) {
			// Happens when called from the packagemanager broadcast before boot.
			return;
			}

	final HashMap<ComponentName, ActivityInfo> availActCache = new HashMap<>();		final HashMap<ComponentName, ActivityInfo> availActCache = new HashMap<>();
	final HashMap<String, ApplicationInfo> availAppCache = new HashMap<>();		final HashMap<String, ApplicationInfo> availAppCache = new HashMap<>();
	final IPackageManager pm = AppGlobals.getPackageManager();		final IPackageManager pm = AppGlobals.getPackageManager();