diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2015-01-19 17:57:53 -0800 |
| commit | 3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394 (patch) | |
| tree | 138459463090a88006035162b3886e483f21ce18 /AndroidManifest.xml | |
| parent | 328cd16b9f5f084adc4e64a2744b2e424a2478fd (diff) | |
| parent | d5758b2ec0edfc257bab18dd7cab572e2e02dbbe (diff) | |
| download | dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.gz dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.tar.bz2 dsub-3e7603a1f3a6b79b64a9a5eda68cfa0de5df1394.zip | |
Merge branch 'master' into DLNA
Conflicts:
AndroidManifest.xml
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 07ec734d..8738171a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -23,7 +23,6 @@ <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
- <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<uses-feature android:name="android.hardware.touchscreen" android:required="false" />
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
@@ -86,8 +85,6 @@ <service android:name=".service.DownloadService"
android:label="Subsonic Download Service"/>
- <service android:name="org.fourthline.cling.android.AndroidUpnpServiceImpl"/>
-
<service android:name="github.daneren2005.dsub.service.sync.AuthenticatorService">
<intent-filter>
<action android:name="android.accounts.AccountAuthenticator"/>
|