Fixed the onActivityResult bug that was caused by the manifest

auto mereger. (I removed the auto merge option from project.properties)

Signed-off-by: Ricky Barrette <rickbarrette@gmail.com>
This commit is contained in:
2012-08-06 12:35:20 -04:00
parent a664e0ad57
commit fc8952e5e9
4 changed files with 126 additions and 5 deletions

View File

@@ -2,10 +2,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.TwentyCodes.android.LocationRinger"
android:installLocation="internalOnly"
android:versionCode="81"
android:versionName="1e45d79" >
android:versionCode="121"
android:versionName="a664e0a" >
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="16"/>
<uses-sdk android:minSdkVersion="7"/>
<uses-feature
android:name="android.hardware.location"
@@ -21,6 +21,25 @@
<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" />
<!-- exception handler lib -->
<uses-permission android:name="android.permission.INTERNET" />
<!-- location lib -->
<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/ic_launcher"
@@ -112,4 +131,4 @@
</activity>
</application>
</manifest>
</manifest>