From 7d31f878a037fa6e142089157550bfa12cd0b65c Mon Sep 17 00:00:00 2001 From: Michelle Ho Date: Fri, 13 Jan 2023 15:38:56 +0000 Subject: [PATCH] RESTRICT AUTOMERGE Revert "Camera: Fix missing onPhysicalCameraUnavailable" This reverts commit 08c0efb03a4e648e6a5fc5de13bc9678d384e106. Reason for revert: GCA incompatible, need to submit along with b/263549589 Change-Id: I16501fab74e154aca97bd687340118e11c3200bf Bug: 265424740 --- core/java/android/hardware/camera2/CameraManager.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index f25d56554fc47..be99f0fefee7e 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -2313,15 +2313,6 @@ public final class CameraManager { final AvailabilityCallback callback = mCallbackMap.keyAt(i); postSingleUpdate(callback, executor, id, null /*physicalId*/, status); - - // Send the NOT_PRESENT state for unavailable physical cameras - if (isAvailable(status) && mUnavailablePhysicalDevices.containsKey(id)) { - ArrayList unavailableIds = mUnavailablePhysicalDevices.get(id); - for (String unavailableId : unavailableIds) { - postSingleUpdate(callback, executor, id, unavailableId, - ICameraServiceListener.STATUS_NOT_PRESENT); - } - } } } // onStatusChangedLocked