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

Commit 9f7aafc2 authored by Automerger Merge Worker's avatar Automerger Merge Worker
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 am: a104f2a9

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



Change-Id: I6613573ddfac0ae7b58aec144470ba2fff9e12b6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59553980 a104f2a9

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 =