diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-12 00:07:33 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-11-12 00:07:33 +0000 |
commit | aede0d189aeda53682fbb6ca0286b1770109d398 (patch) | |
tree | 52b0440ffff7a333498ecff2cbcf9e49ef38ba18 | |
parent | cb3ebb77dcd3567ceaf0651887c0dcfe2a149728 (diff) | |
parent | 90744053bb00cdf08b647e806ff60caa139152ab (diff) | |
download | Camera2-android12L-s1-release.tar.gz |
Snap for 7906314 from 90744053bb00cdf08b647e806ff60caa139152ab to sc-v2-releaseandroid-vts-12.1_r9android-vts-12.1_r8android-vts-12.1_r7android-vts-12.1_r6android-vts-12.1_r5android-vts-12.1_r4android-vts-12.1_r3android-vts-12.1_r2android-vts-12.1_r10android-vts-12.1_r1android-platform-12.1.0_r9android-platform-12.1.0_r8android-platform-12.1.0_r7android-platform-12.1.0_r6android-platform-12.1.0_r5android-platform-12.1.0_r4android-platform-12.1.0_r3android-platform-12.1.0_r22android-platform-12.1.0_r21android-platform-12.1.0_r20android-platform-12.1.0_r2android-platform-12.1.0_r19android-platform-12.1.0_r18android-platform-12.1.0_r17android-platform-12.1.0_r16android-platform-12.1.0_r15android-platform-12.1.0_r14android-platform-12.1.0_r13android-platform-12.1.0_r12android-platform-12.1.0_r11android-platform-12.1.0_r10android-platform-12.1.0_r1android-cts-12.1_r9android-cts-12.1_r8android-cts-12.1_r7android-cts-12.1_r6android-cts-12.1_r5android-cts-12.1_r4android-cts-12.1_r3android-cts-12.1_r2android-cts-12.1_r10android-cts-12.1_r1android-12.1.0_r6android-12.1.0_r5android-12.1.0_r4android-12.1.0_r3android-12.1.0_r27android-12.1.0_r2android-12.1.0_r1android12L-tests-releaseandroid12L-s1-releaseandroid12L-release
Change-Id: I6da75dddac23457555ec362c3179da1abc080c88
-rw-r--r-- | src/com/android/camera/SetActivitiesCameraReceiver.java | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/src/com/android/camera/SetActivitiesCameraReceiver.java b/src/com/android/camera/SetActivitiesCameraReceiver.java index 7a79c52e6..347e82b9f 100644 --- a/src/com/android/camera/SetActivitiesCameraReceiver.java +++ b/src/com/android/camera/SetActivitiesCameraReceiver.java @@ -38,8 +38,7 @@ public class SetActivitiesCameraReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { // Disable camera-related activities if there is no camera. int component_state = (CHECK_BACK_CAMERA_ONLY - ? hasBackCamera() - : (hasCamera() || supportExternalCamera(context))) + ? hasBackCamera(context) : hasCamera(context)) ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED : PackageManager.COMPONENT_ENABLED_STATE_DISABLED; @@ -50,29 +49,16 @@ public class SetActivitiesCameraReceiver extends BroadcastReceiver { } } - private boolean supportExternalCamera(Context context) { + private boolean hasCamera(Context context) { PackageManager pm = context.getPackageManager(); - return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL); + return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA) + || pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_FRONT) + || pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_EXTERNAL); } - private boolean hasCamera() { - int n = android.hardware.Camera.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; + private boolean hasBackCamera(Context context) { + PackageManager pm = context.getPackageManager(); + return pm.hasSystemFeature(PackageManager.FEATURE_CAMERA); } private void setComponent(Context context, String klass, final int enabledState) { |