Merge "Camera: Fix null pointer access" am: e1cd25ae2c am: efe8939400
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:
@@ -498,7 +498,8 @@ public class CameraServiceProxy extends SystemService
|
|||||||
|
|
||||||
if ((recentTasks != null) && (!recentTasks.getList().isEmpty())) {
|
if ((recentTasks != null) && (!recentTasks.getList().isEmpty())) {
|
||||||
for (ActivityManager.RecentTaskInfo task : recentTasks.getList()) {
|
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 = new TaskInfo();
|
||||||
taskInfo.frontTaskId = task.taskId;
|
taskInfo.frontTaskId = task.taskId;
|
||||||
taskInfo.isResizeable =
|
taskInfo.isResizeable =
|
||||||
|
|||||||
Reference in New Issue
Block a user