From e0bd7f8330b1473b186f82d3e253b0e6d55230a5 Mon Sep 17 00:00:00 2001
From: Ricky Barrette <rickbarrette@gmail.com>
Date: Thu, 7 Jun 2012 10:19:19 -0400
Subject: [PATCH] Re-added required permissions (no longer testing ADT 20)

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
---
 LocationRinger/AndroidManifest.xml              | 17 +++++++++++++++--
 .../android/LocationRinger/ui/ListActivity.java |  3 +--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index 1e600cc..0a0b434 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -17,11 +17,22 @@
     <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.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"
@@ -36,7 +47,8 @@
         </activity>
         <activity
             android:name=".ui.RingerInformationActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation" />
+            android:configChanges="keyboard|keyboardHidden|orientation"
+            android:launchMode="singleInstance" />
 
         <receiver
             android:name=".receivers.SystemReceiver"
@@ -99,7 +111,8 @@
         </activity>
         <activity
             android:name="com.TwentyCodes.android.exception.ExceptionReportActivity"
-            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize" >
+            android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize"
+            android:launchMode="singleInstance" >
         </activity>
 
         <service
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
index 6b16eac..c251332 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/ListActivity.java
@@ -274,8 +274,7 @@ public class ListActivity extends Activity implements OnItemClickListener, OnCli
 			 public void run(){
 				 Looper.prepare();
 				 
-		    	final Intent i = new Intent(ListActivity.this, RingerInformationActivity.class)
-		    	.putExtra(KEY_ROWID, id+1);
+		    	final Intent i = new Intent(ListActivity.this, RingerInformationActivity.class).putExtra(KEY_ROWID, id+1);
 		    	
 		    	/*
 		    	 * get the ringer