diff options
| author | 2023-03-09 21:29:31 +0000 | |
|---|---|---|
| committer | 2023-03-09 21:29:31 +0000 | |
| commit | a104f2a9e065cb685aee4da6c5ec1f052df8c497 (patch) | |
| tree | 4bea935a54855b5907461ccfcd0b280bde7c991d | |
| parent | 6ad3e13b12ab321408dfb6c9798b7b61bd2f2a56 (diff) | |
| parent | cdb5bbd261186279693a734609aad345c4465ed4 (diff) | |
Merge "Merge "Camera: Fix null pointer access" am: e1cd25ae2c am: efe8939400 am: 4ee3891cf5" into udc-dev
| -rw-r--r-- | services/core/java/com/android/server/camera/CameraServiceProxy.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/camera/CameraServiceProxy.java b/services/core/java/com/android/server/camera/CameraServiceProxy.java index 12134f776ffd..4e3de3cf9506 100644 --- a/services/core/java/com/android/server/camera/CameraServiceProxy.java +++ b/services/core/java/com/android/server/camera/CameraServiceProxy.java @@ -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 = |