From 1de98fc9efae42ddf655236c1bd65b3738beade0 Mon Sep 17 00:00:00 2001 From: Alice Sheng Date: Fri, 16 Mar 2018 09:45:58 -0700 Subject: [PATCH] Add null check to RecentTasks.java isRecentComponentHomeActivity throws a null pointer exception if mRecentsComponent is null. Bug: 75261682 Change-Id: Ia177b00ae11a42ddaa13350da686c96cd61436af --- services/core/java/com/android/server/am/RecentTasks.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/am/RecentTasks.java b/services/core/java/com/android/server/am/RecentTasks.java index 3f05ecee77ef1..fc8b624f6b7e6 100644 --- a/services/core/java/com/android/server/am/RecentTasks.java +++ b/services/core/java/com/android/server/am/RecentTasks.java @@ -285,7 +285,7 @@ class RecentTasks { boolean isRecentsComponentHomeActivity(int userId) { final ComponentName defaultHomeActivity = mService.getPackageManagerInternalLocked() .getDefaultHomeActivity(userId); - return defaultHomeActivity != null && + return defaultHomeActivity != null && mRecentsComponent != null && defaultHomeActivity.getPackageName().equals(mRecentsComponent.getPackageName()); }