aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ui
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2021-02-19 19:29:57 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2021-02-19 19:30:17 +0530
commit617be576f8a1bc41ec0b32ea57c84e44626b7352 (patch)
treec7d0f749e06f923353b7b07bf4e6c4b0bde4289c /ui
parenttunnel: report git commit as wgVersion (diff)
downloadwireguard-android-617be576f8a1bc41ec0b32ea57c84e44626b7352.tar.xz
wireguard-android-617be576f8a1bc41ec0b32ea57c84e44626b7352.zip
build: upgrade to ZXING 4.1.0
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'ui')
-rw-r--r--ui/src/main/AndroidManifest.xml5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/src/main/AndroidManifest.xml b/ui/src/main/AndroidManifest.xml
index 56e7184c..ce527498 100644
--- a/ui/src/main/AndroidManifest.xml
+++ b/ui/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
android:name="android.software.leanback"
android:required="false" />
<uses-feature
- android:name="android.hardware.camera"
+ android:name="android.hardware.camera.any"
android:required="false" />
<permission
@@ -29,6 +29,9 @@
android:label="@string/permission_label"
android:protectionLevel="dangerous" />
+ <!-- This is safe to override, the APIs we use work perfectly fine on Android 6 -->
+ <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
+
<application
android:name=".Application"
android:allowBackup="false"