Merge "Camera: Fix null pointer access" am: e1cd25ae2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2479399

Change-Id: I89060de745339c20364c29a1c5ed101bbd4db90f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Emilian Peev
2023-03-09 21:10:29 +00:00
committed by Automerger Merge Worker

View File

@@ -498,7 +498,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 =