Backend exceptions should be catched

microg · Mar 10, 2014 · 67a4030 · 67a4030
1 parent 2165785
commit 67a4030
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git 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
@@ -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
@@ -73,7 +73,7 @@ public Location update() {
 			try {
 				setLastLocation(backend.update());
 				provider.reportLocation(lastLocation);
-			} catch (RemoteException e) {
+			} catch (Exception e) {
 				Log.w(TAG, e);
 				unbind();
 			}