commit c1f3e64b6b8a34c85a90fb2ee083431b6722ec60 Author: Nathan Freitas nathan@freitas.net Date: Mon Nov 24 13:21:31 2014 -0500

update version specific manifests --- AndroidManifest.KITKAT_AND_LOWER.xml | 6 ++++-- AndroidManifest.LOLLIPOP.xml | 8 +++++--- 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/AndroidManifest.KITKAT_AND_LOWER.xml b/AndroidManifest.KITKAT_AND_LOWER.xml index 4d909b1..072729b 100644 --- a/AndroidManifest.KITKAT_AND_LOWER.xml +++ b/AndroidManifest.KITKAT_AND_LOWER.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.1.1" - android:versionCode="128" + android:versionName="14.1.3-noPIE" + android:versionCode="130" android:installLocation="auto" > @@ -23,6 +23,7 @@ android:allowBackup="false" android:allowClearUserData="true" android:persistent="true" + android:stopWithTask="false" >

<activity android:name=".Orbot" android:configChanges="orientation|screenSize" @@ -85,6 +86,7 @@ <service android:enabled="true" android:name=".service.TorService" android:permission="org.torproject.android.MANAGE_TOR" + android:stopWithTask="false" > <intent-filter> <action android:name="org.torproject.android.service.ITorService" /> diff --git a/AndroidManifest.LOLLIPOP.xml b/AndroidManifest.LOLLIPOP.xml index 69d8d87..de175f9 100644 --- a/AndroidManifest.LOLLIPOP.xml +++ b/AndroidManifest.LOLLIPOP.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.1.1-PIE" - android:versionCode="129" + android:versionName="14.1.3-PIE" + android:versionCode="130" android:installLocation="auto" > - <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21"/> + <uses-sdk android:minSdkVersion="21" android:maxSdkVersion="21" android:targetSdkVersion="21"/> <permission android:name="org.torproject.android.MANAGE_TOR" android:label="@string/permission_manage_tor_label" android:description="@string/permission_manage_tor_description" android:protectionLevel="signature"></permission>

<uses-permission android:name="android.permission.INTERNET" /> @@ -23,6 +23,7 @@ android:allowBackup="false" android:allowClearUserData="true" android:persistent="true" + android:stopWithTask="false" >

<activity android:name=".Orbot" android:configChanges="orientation|screenSize" @@ -85,6 +86,7 @@ <service android:enabled="true" android:name=".service.TorService" android:permission="org.torproject.android.MANAGE_TOR" + android:stopWithTask="false" > <intent-filter> <action android:name="org.torproject.android.service.ITorService" />