Merge "Add null check to RecentTasks.java" into pi-dev

2018-03-16 23:53:29 +00:00
parent 03c07f859d 1de98fc9ef
commit ad5d8175da
1 changed files with 1 additions and 1 deletions
--- 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());
    }