From fc490ab278a3ce5df7c2a0a3ed5ea02dc87bd01b Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Wed, 20 Jan 2021 13:50:22 -0800 Subject: [PATCH] Add missing null check in HomeVisibilityListener Fixes: 178028272 Test: atest HomeVisibilityListenerTest Change-Id: I3d4158cece84e79b3bfa29efcdb038c65e393d38 --- core/java/android/app/HomeVisibilityListener.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/java/android/app/HomeVisibilityListener.java b/core/java/android/app/HomeVisibilityListener.java index c6e5699c5fe2d..57d868b2b969d 100644 --- a/core/java/android/app/HomeVisibilityListener.java +++ b/core/java/android/app/HomeVisibilityListener.java @@ -19,6 +19,7 @@ package android.app; import android.annotation.SuppressLint; import android.annotation.SystemApi; import android.annotation.TestApi; +import android.content.ComponentName; import android.content.Context; import android.os.Binder; @@ -101,12 +102,11 @@ public abstract class HomeVisibilityListener { } // We can assume that the screen is idle if the home application is in the foreground. - String defaultHomePackage = mContext.getPackageManager() - .getHomeActivities(new ArrayList<>()).getPackageName(); - if (Objects.equals(top, defaultHomePackage)) { - return true; - } + ComponentName defaultHomeComponent = mContext.getPackageManager() + .getHomeActivities(new ArrayList<>()); + if (defaultHomeComponent == null) return false; - return false; + String defaultHomePackage = defaultHomeComponent.getPackageName(); + return Objects.equals(top, defaultHomePackage); } }