Snap for 7256547 from 3a6b247 to rvc-qpr3-release

Change-Id: If544b68af2156503a1eedfe05f197b4c980cca48

Author: android-build-team Robot

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

@@ -1363,6 +1363,8 @@ public void onCameraClosed(String id) {
                     // devices going offline (in real world scenarios, these permissions aren't
                     // changeable). Future calls to getCameraIdList() will reflect the changes in
                     // the camera id list after getCameraIdListNoLazy() is called.
+                    // We need to remove the torch ids which may have been associated with the
+                    // devices removed as well. This is the same situation.
                     cameraStatuses = mCameraService.addListener(testListener);
                     mCameraService.removeListener(testListener);
                     for (CameraStatus c : cameraStatuses) {
@@ -1381,6 +1383,7 @@ public void onCameraClosed(String id) {
                     }
                     for (String id : deviceIdsToRemove) {
                         onStatusChangedLocked(ICameraServiceListener.STATUS_NOT_PRESENT, id);
+                        mTorchStatus.remove(id);
                     }
                 } catch (ServiceSpecificException e) {
                     // Unexpected failure