am c8594ddf: Check for zero length array returns
* commit 'c8594ddf504109dc3c17baf9c2448469b28973e9':
Check for zero length array returns
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index d8ae9e4..6e5d38f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -44,7 +44,8 @@
android:largeHeap="true"
android:restoreAnyVersion="true"
android:supportsRtl="true"
- android:theme="@style/Theme.Camera" >
+ android:theme="@style/Theme.Camera"
+ android:usesCleartextTraffic="false" >
<activity
android:name="com.android.camera.CameraActivity"
android:clearTaskOnLaunch="true"
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index 2005104..c56fba0 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -107,8 +107,8 @@
<string name="pref_camera_flashmode_title" msgid="8363803841022314574">"Chaqnoq rejimi"</string>
<string name="pref_camera_flashmode_label" msgid="5852483713534762800">"CHAQNOQ REJIMI"</string>
<string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"Avto"</string>
- <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Yoniq"</string>
- <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"O‘chiq"</string>
+ <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Yoqilgan"</string>
+ <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"O‘chirilgan"</string>
<string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"AVTO CHAQNOQ"</string>
<string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"CHAQNOQ YONIQ"</string>
<string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"CHAQNOQ O‘CHIQ"</string>
@@ -227,7 +227,7 @@
<string name="capital_on" msgid="1118214824959797269">"YONIQ"</string>
<string name="capital_off" msgid="3020696135020167263">"O‘CHIQ"</string>
<string name="video_control_play" msgid="6895236811408921715">"Videoni ijro etish"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"O‘chiq"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"O‘chirilgan"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0.5 soniya"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 soniya"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1.5 soniya"</string>
diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index 8d0b387..0cedb18 100644
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -40,10 +40,8 @@
*/
public static OneCameraFeatureConfig createDefault(ContentResolver contentResolver,
MemoryManager memoryManager) {
- // Enable CaptureModule on all L devices unless the device is
- // black-listed.
- boolean useCaptureModule = ApiHelper.HAS_CAMERA_2_API
- && !GservicesHelper.isCaptureModuleDisabled(contentResolver);
+ // Enable CaptureModule on all M devices.
+ boolean useCaptureModule = true;
Log.i(TAG, "CaptureModule? " + useCaptureModule);
// HDR+ has multiple levels of support.
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 1b97553..471ee05 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -114,7 +114,7 @@
}
public static boolean isMOrHigher() {
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.MNC
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
|| "MNC".equals(Build.VERSION.CODENAME);
}
}