1 files changed, 4 insertions, 12 deletions
diff --git a/src/com/android/camera/DisableCameraReceiver.java b/src/com/android/camera/DisableCameraReceiver.java
index 4cef85f46..3551a4306 100644
--- a/src/com/android/camera/DisableCameraReceiver.java
+++ b/src/com/android/camera/DisableCameraReceiver.java
@@ -53,23 +53,15 @@ public class DisableCameraReceiver extends BroadcastReceiver {
     }
 
     private boolean hasCamera() {
-        int n = android.hardware.Camera.getNumberOfCameras();
+        int n = CameraHolder.instance().getNumberOfCameras();
         Log.i(TAG, "number of camera: " + n);
         return (n > 0);
     }
 
     private boolean hasBackCamera() {
-        int n = android.hardware.Camera.getNumberOfCameras();
-        CameraInfo info = new CameraInfo();
-        for (int i = 0; i < n; i++) {
-            android.hardware.Camera.getCameraInfo(i, info);
-            if (info.facing == CameraInfo.CAMERA_FACING_BACK) {
-                Log.i(TAG, "back camera found: " + i);
-                return true;
-            }
-        }
-        Log.i(TAG, "no back camera");
-        return false;
+        int backCameraId = CameraHolder.instance().getBackCameraId();
+        Log.i(TAG, backCameraId == -1 ? "no back camera" : ("back camera found: " + backCameraId));
+        return backCameraId != -1;
     }
 
     private void disableComponent(Context context, String klass) {