Merge "Null checker in AuthController" into udc-qpr-dev

1 files changed, 11 insertions, 9 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
index d976ead1f16f..e58876a2632c 100644
--- a/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
+++ b/packages/SystemUI/src/com/android/systemui/biometrics/AuthController.java
@@ -242,15 +242,17 @@ public class AuthController implements CoreStartable, CommandQueue.Callbacks,
     }
 
     private boolean isOwnerInForeground() {
-        final String clientPackage = mCurrentDialog.getOpPackageName();
-        final List<ActivityManager.RunningTaskInfo> runningTasks =
-                mActivityTaskManager.getTasks(1);
-        if (!runningTasks.isEmpty()) {
-            final String topPackage = runningTasks.get(0).topActivity.getPackageName();
-            if (!topPackage.contentEquals(clientPackage)
-                    && !Utils.isSystem(mContext, clientPackage)) {
-                Log.w(TAG, "Evicting client due to: " + topPackage);
-                return false;
+        if (mCurrentDialog != null) {
+            final String clientPackage = mCurrentDialog.getOpPackageName();
+            final List<ActivityManager.RunningTaskInfo> runningTasks =
+                    mActivityTaskManager.getTasks(1);
+            if (!runningTasks.isEmpty()) {
+                final String topPackage = runningTasks.get(0).topActivity.getPackageName();
+                if (!topPackage.contentEquals(clientPackage)
+                        && !Utils.isSystem(mContext, clientPackage)) {
+                    Log.w(TAG, "Evicting client due to: " + topPackage);
+                    return false;
+                }
             }
         }
         return true;