From cb442b876f7866fbd32b268ba97d2aaa3672ecf0 Mon Sep 17 00:00:00 2001
From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sat, 21 Jul 2012 22:20:14 +0200
Subject: [PATCH] remove location service registration after booting

---
 AndroidManifest.xml | 11 +----------
 actionbarsherlock   |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b113f31e09..6eeed8f383 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.170B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.171B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
@@ -129,15 +129,6 @@
             </intent-filter>
         </service>
 
-        <receiver android:name=".location.LocationServiceLauncherReciever" >
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="eu.alefzero.owncloud.location.LocationLauncher" />
-
-                <category android:name="android.intent.category.HOME" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name=".ui.activity.FileDetailActivity" />
         <activity android:name=".ui.activity.PinCodeActivity" />
         <activity android:name=".extensions.ExtensionsAvailableActivity"></activity>
diff --git a/actionbarsherlock b/actionbarsherlock
index 8fcee10a34..9598f2bb2c 160000
--- a/actionbarsherlock
+++ b/actionbarsherlock
@@ -1 +1 @@
-Subproject commit 8fcee10a340d54fb4acdbddcdc1746ad3f377eca
+Subproject commit 9598f2bb2ceed4a834cd5586a903f270ca4c0ccc