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 am: a104f2a9e0

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

Change-Id: I6613573ddfac0ae7b58aec144470ba2fff9e12b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker
2023-03-09 21:46:50 +00:00
parent 59553980d3 a104f2a9e0
commit 9f7aafc26e
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 =