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

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

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

Change-Id: I1edba690f0b7d37ea3cc143e50cadb45501bf028
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:24:59 +00:00
committed by Automerger Merge Worker
parent b4fe928b80 efe8939400
commit 4ee3891cf5
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

@@ -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 =