Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae2c am: efe8939400 am: 4ee3891cf5" into udc-dev

Browse Source
This commit is contained in:
Automerger Merge Worker
2023-03-09 21:29:31 +00:00
committed by Android (Google) Code Review
parent 6ad3e13b12 cdb5bbd261
commit a104f2a9e0
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/camera/CameraServiceProxy.java
View File

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