From fb365afd81502c35f312c85e5f47c1fb720640ac Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Thu, 7 Jun 2012 11:00:25 -0400
Subject: [PATCH] Reverted manifest to rev c5c02e39 and updated to meet current
 requirements

closes #97

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 LocationRinger/AndroidManifest.xml | 53 ++++++++++++++----------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index 0a0b434..35a193e 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -5,37 +5,36 @@
     android:versionCode="21"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="11" />
+    <uses-sdk android:minSdkVersion="7" />
 
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="true" />
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <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.WRITE_SETTINGS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CONTROL_LOCATION_UPDATES" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_UPDATES" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
         android:icon="@drawable/icon"
         android:label="@string/app_name"
         android:theme="@style/Theme.Custom" >
-        <uses-library android:name="com.google.android.maps" />
-
         <activity
             android:name="LocationRinger"
-            android:configChanges="keyboard|keyboardHidden|orientation"
+            android:configChanges="keyboard|orientation"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -45,10 +44,12 @@
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
             </intent-filter>
         </activity>
+
+        <uses-library android:name="com.google.android.maps" />
+
         <activity
             android:name=".ui.RingerInformationActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation"
-            android:launchMode="singleInstance" />
+            android:configChanges="keyboard|orientation" />
 
         <receiver
             android:name=".receivers.SystemReceiver"
@@ -89,13 +90,19 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-                <action android:name="action_update" />
             </intent-filter>
 
             <meta-data
                 android:name="android.appwidget.provider"
                 android:resource="@xml/updatelocationwidgetinfo" />
         </receiver>
+
+        <activity
+            android:name="com.TwentyCodes.android.exception.ExceptionReportActivity"
+            android:configChanges="keyboard|orientation" />
+
+        <service android:name="com.TwentyCodes.android.exception.ReportPostingService" />
+
         <receiver
             android:name=".receivers.PassiveLocationChangedReceiver"
             android:enabled="true"
@@ -109,16 +116,6 @@
                 <action android:name="android.intent.action.CREATE_SHORTCUT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.TwentyCodes.android.exception.ExceptionReportActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
-            android:launchMode="singleInstance" >
-        </activity>
-
-        <service
-            android:name="com.TwentyCodes.android.exception.ReportPostingService"
-            android:process=":ReportPostingService" >
-        </service>
     </application>
 
 </manifest>
\ No newline at end of file