Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a104f2a9 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae am: efe89394... 

Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae am: efe89394 am: 4ee3891c" into udc-dev
parents 6ad3e13b cdb5bbd2

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

+2 −1
Original line number Diff line number Diff line
@@ -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 =