From 67a4030078933a5183477afb935a2eb64aa806fb Mon Sep 17 00:00:00 2001
From: mar-v-in <github@rvin.mooo.com>
Date: Mon, 10 Mar 2014 14:04:05 +0100
Subject: [PATCH] Backend exceptions should be catched

---
 Android.mk                                     |  2 ++
 AndroidManifest.xml                            | 17 ++++++++---------
 src/org/microg/nlp/location/BackendHelper.java |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Android.mk b/Android.mk
index 26f4d3c..6522793 100644
--- a/Android.mk
+++ b/Android.mk
@@ -29,6 +29,8 @@ LOCAL_PACKAGE_NAME := UnifiedNlp
 LOCAL_SDK_VERSION := current
 LOCAL_PRIVILEGED_MODULE := true
 
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+
 include $(BUILD_PACKAGE)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8ebd399..dfaa54d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="org.microg.nlp"
+<manifest
+	package="org.microg.nlp"
 	xmlns:android="http://schemas.android.com/apk/res/android">
 
 	<uses-sdk android:minSdkVersion="14" />
 
-	<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER"/>
-	<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES"/>
-	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
-	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+	<uses-permission android:name="android.permission.INSTALL_LOCATION_PROVIDER" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES" />
+	<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+	<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
 	<application
 		android:icon="@drawable/nlp_app_icon"
 		android:label="@string/nlp_app_name">
-		<uses-library
-			android:name="com.android.location.provider"
-			android:required="false" />
+		<uses-library android:name="com.android.location.provider" />
 
 		<!-- Gingerbread / Ice Cream Sandwich -->
 		<service
diff --git a/src/org/microg/nlp/location/BackendHelper.java b/src/org/microg/nlp/location/BackendHelper.java
index 884b9b2..d5aab21 100644
--- a/src/org/microg/nlp/location/BackendHelper.java
+++ b/src/org/microg/nlp/location/BackendHelper.java
@@ -73,7 +73,7 @@ public class BackendHelper implements BackendHandler {
 			try {
 				setLastLocation(backend.update());
 				provider.reportLocation(lastLocation);
-			} catch (RemoteException e) {
+			} catch (Exception e) {
 				Log.w(TAG, e);
 				unbind();
 			}