diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 1064d29..a2b6299 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -620,9 +620,6 @@
                         "] at CameraState[" + cameraState + "]";
                 Log.e(TAG, "RuntimeException during " + errorContext, ex);
 
-                // Be conservative by invalidating both CameraAgent and CameraProxy objects.
-                mCameraState.invalidate();
-
                 if (mCamera != null) {
                     Log.i(TAG, "Release camera since mCamera is not null.");
                     try {