Skip to content

briar
briar
Commit 099e8ef4 authored by Torsten Grote's avatar Torsten Grote
Browse files
Options

Merge branch 'bluetooth-not-required' into 'master' 

Allow devices without Bluetooth support

See merge request !867
parents 481de00f 05152eef
Pipeline #1921 passed with stage
    in 8 minutes and 31 seconds
    Hide whitespace changes
    Inline Side-by-side
    Showing with 2 additions and 3 deletions
    bramble-android/src/main/AndroidManifest.xml
    View file @ 099e8ef4
    ......@@ -2,14 +2,13 @@
    package="org.briarproject.bramble"
    xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-feature android:name="android.hardware.bluetooth"/>
    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
    <uses-permission android:name="android.permission.BLUETOOTH"/>
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.READ_LOGS"/>
    <uses-permission android:name="android.permission.WAKE_LOCK"/>
    <application
    ......
    briar-android/src/main/AndroidManifest.xml
    View file @ 099e8ef4
    ......@@ -3,7 +3,7 @@
    package="org.briarproject.briar"
    xmlns:android="http://schemas.android.com/apk/res/android">
    <uses-feature android:name="android.hardware.bluetooth"/>
    <uses-feature android:name="android.hardware.bluetooth" android:required="false"/>
    <uses-feature android:name="android.hardware.camera" />
    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
    ......
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment