miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: do not request SD card write access for Android 4.4 and above, unless enabled in AndroidAppSettings

Browse Source
This commit is contained in:
Sergii Pylypenko
2015-10-23 15:55:53 +03:00
parent b62d3aac8d
commit 54de45e77c
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changeAppSettings.sh
View File

@@ -801,6 +801,8 @@ esac
if [ "$AccessSdCard" = "n" ]; then if [ "$AccessSdCard" = "n" ]; then
$SEDI "/==EXTERNAL_STORAGE==/ d" project/AndroidManifest.xml $SEDI "/==EXTERNAL_STORAGE==/ d" project/AndroidManifest.xml
else
$SEDI "/==NOT_EXTERNAL_STORAGE==/ d" project/AndroidManifest.xml
fi fi
if [ "$AccessInternet" = "n" ]; then if [ "$AccessInternet" = "n" ]; then

11
project/AndroidManifestTemplate.xml
View File

@@ -45,11 +45,12 @@
</application> </application>
<uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/> <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="23"/>
<!-- ==INTERNET== --> <uses-permission android:name="android.permission.INTERNET"></uses-permission> <!-- ==INTERNET== --> <uses-permission android:name="android.permission.INTERNET" />
<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> <!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission> <!-- ==EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<!-- ==RECORD_AUDIO== --> <uses-permission android:name="android.permission.RECORD_AUDIO"></uses-permission> <!-- ==NOT_EXTERNAL_STORAGE== --> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" /> <!-- App has write access to it's own dir on SD card without this permission on Android 4.4 and above -->
<!-- ==ADMOB== --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission> <!-- ==RECORD_AUDIO== --> <uses-permission android:name="android.permission.RECORD_AUDIO" />
<!-- ==ADMOB== --> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<!-- <uses-permission android:name="android.permission.VIBRATE"></uses-permission> --> <!-- Vibrator not supported yet by SDL --> <!-- <uses-permission android:name="android.permission.VIBRATE"></uses-permission> --> <!-- Vibrator not supported yet by SDL -->

2
project/jni/application/xserver/AndroidAppSettings.cfg
View File

@@ -160,7 +160,7 @@ AppUsesMultitouch=y
AppRecordsAudio=n AppRecordsAudio=n
# Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n) # Application needs to access SD card. If your data files are bigger than 5 Mb, enable it. (y) / (n)
AccessSdCard= AccessSdCard=n
# Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n) # Application needs Internet access. If you disable it, you'll have to bundle all your data files inside .apk (y) / (n)
AccessInternet=y AccessInternet=y