Merge "Camera: Fix null pointer access"

2023-03-09 20:25:18 +00:00
parent 1c46ad7dfc 26726fc81e
commit e1cd25ae2c
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/camera/CameraServiceProxy.java
+++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java
@@ -487,7 +487,8 @@ public class CameraServiceProxy extends SystemService

            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 =