Merge "Fix NullPointerException when ActivityManager is not available." into main (9c9fefec) · Commits · e / os / android_frameworks_base

core/java/android/hardware/camera2/CameraManager.java

+12 −11

Original line number	Diff line number	Diff line
		@@ -1699,12 +1699,12 @@ public final class CameraManager {
		}

		if (context != null) {
		final ActivityManager activityManager =
		context.getSystemService(ActivityManager.class);
		final ActivityManager activityManager = context.getSystemService(ActivityManager.class);
		if (activityManager != null) {
		for (ActivityManager.AppTask appTask : activityManager.getAppTasks()) {
		final TaskInfo taskInfo = appTask.getTaskInfo();
		final int freeformCameraCompatMode =
		taskInfo.appCompatTaskInfo.cameraCompatTaskInfo.freeformCameraCompatMode;
		final int freeformCameraCompatMode = taskInfo.appCompatTaskInfo
		.cameraCompatTaskInfo.freeformCameraCompatMode;
		if (freeformCameraCompatMode != 0
		&& taskInfo.topActivity != null
		&& taskInfo.topActivity.getPackageName().equals(packageName)) {
		@@ -1713,6 +1713,7 @@ public final class CameraManager {
		}
		}
		}
		}

		if (packageManager != null && packageName != null) {
		try {