diff options
| author | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
|---|---|---|
| committer | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
| commit | 3018f292ff635d7ec61b3cd02a1e13659819683f (patch) | |
| tree | 32de630e310e6055124ee92a0d5788a76f6cd94d /AndroidManifest.xml | |
| parent | 83dfeaa842bd42840698bdce9a91207a75395b3e (diff) | |
| parent | 80d073d5fd79e0c57e33e708e6917e9f36c9bebc (diff) | |
Merge local changes with repository
Diffstat (limited to 'AndroidManifest.xml')
| -rw-r--r-- | AndroidManifest.xml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d1339ee0..084e382a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,20 +17,24 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.blinkt.openvpn" - android:versionCode="52" - android:versionName="0.5.25" > + android:versionCode="55" + android:versionName="0.5.27" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> --> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> + <uses-permission android:name="android.permission.READ_LOGS" /> <!-- <uses-permission android:name="com.android.vending.BILLING" /> --> - <uses-sdk android:minSdkVersion="14" /> + <uses-sdk + android:minSdkVersion="14" + android:targetSdkVersion="14" /> <application + android:allowBackup="true" android:icon="@drawable/icon" android:label="@string/app" > <activity android:name=".AboutFragment" /> @@ -40,6 +44,7 @@ <activity android:name=".LogWindow" android:label="@string/openvpn_log" /> + <activity android:name=".SendDumpActivity" /> <activity android:name=".FileSelect" /> <activity android:name=".MainActivity" > <intent-filter> @@ -114,6 +119,12 @@ <category android:name="android.intent.category.DEFAULT" /> </intent-filter> </activity-alias> + + <provider + android:name=".FileProvider" + android:authorities="de.blinkt.openvpn.FileProvider" + android:exported="true" + android:grantUriPermissions="true" /> </application> </manifest>
\ No newline at end of file |