Merge branch 'master' into dev

Lauszus · Jun 6, 2018 · c360a93 · c360a93
2 parents 5149ed1 + 6d73878
commit c360a93
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ The reports I wrote together with Jonathan Wang can be found at the following li
 
 In order to built this project you need to download and install [Android Studio](http://developer.android.com/sdk/index.html). You will then need to install the [Android NDK](https://developer.android.com/studio/projects/add-native-code.html#download-ndk).
 
-Then simply download the latest release: <https://github.com/Lauszus/FaceRecognitionApp/releases/download/1.2.1/FaceRecognitionApp-1.2.1.zip> and open the project in Android Studio.
+Then simply download the latest release: <https://github.com/Lauszus/FaceRecognitionApp/releases/download/1.2.2/FaceRecognitionApp-1.2.2.zip> and open the project in Android Studio.
 
 ## Advanced build instructions
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId 'com.lauszus.facerecognitionapp'
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 4
-        versionName '1.2.1'
+        versionCode 5
+        versionName '1.2.2'
         vectorDrawables.useSupportLibrary = true
         ndk {
             stl 'gnustl_static'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,10 +5,10 @@
     <!--<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>-->
     <uses-permission android:name="android.permission.CAMERA"/>
 
-    <uses-feature android:name="android.hardware.camera"/>
-    <uses-feature android:name="android.hardware.camera.autofocus"/>
-    <uses-feature android:name="android.hardware.camera.front"/>
-    <uses-feature android:name="android.hardware.camera.front.autofocus"/>
+    <uses-feature android:name="android.hardware.camera" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front" android:required="false"/>
+    <uses-feature android:name="android.hardware.camera.front.autofocus" android:required="false"/>
 
     <application
         android:hardwareAccelerated="true"