commit e1cd25ae2c42b76a60c2239bc0a24feec35ac66c
author Emilian Peev <epeev@google.com> Thu Mar 09 20:25:18 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 09 20:25:18 2023 +0000
tree 9d3b996cebcef2fa3e57b31e025c2b3cffcc7062
parent 1c46ad7dfca1e8b512cbfc8d024ea4dd78ad4ac8
parent 26726fc81e5a766fccf47db16eb41e71a028a071

Merge "Camera: Fix null pointer access"

services/core/java/com/android/server/camera/CameraServiceProxy.java

diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java
index aec60de..96fcd9d 100644
--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
+++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
@@ -487,7 +487,8 @@
 
             if ((recentTasks != null) && (!recentTasks.getList().isEmpty())) {
                 for (ActivityManager.RecentTaskInfo task : recentTasks.getList()) {
-                    if (packageName.equals(task.topActivityInfo.packageName)) {
+                    if (task.topActivityInfo != null && packageName.equals(
+                            task.topActivityInfo.packageName)) {
                         taskInfo = new TaskInfo();
                         taskInfo.frontTaskId = task.taskId;
                         taskInfo.isResizeable =