libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-03-04 14:37:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8293 from unknownbrackets/android-minor

Browse Source 
Send initial permission grant for storage when available
This commit is contained in:
Henrik Rydgård 2015-12-23 08:46:50 +01:00
commit b66a9756cd
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
android/custom_rules.xml
View File

@ -1,14 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="PPSSPP" default="help">
<condition property="ndkbuild_exe" value="ndk-build.cmd" else="ndk-build">
<os family="windows" />
</condition>
<property name="ndkbuildopt" value=""/>
<target name="-pre-build">
<exec executable="${ndk.dir}/ndk-build" failonerror="true">
<exec executable="${ndk.dir}/${ndkbuild_exe}" failonerror="true">
<arg line="-j4 ${ndkbuildopt}"/>
<env key="NDK_MODULE_PATH" path="../ext:../ext/native/ext"/>
</exec>
</target>
<target name="clean" depends="android_rules.clean">
<exec executable="${ndk.dir}/ndk-build" failonerror="true">
<exec executable="${ndk.dir}/${ndkbuild_exe}" failonerror="true">
<arg value="clean"/>
<env key="NDK_MODULE_PATH" path="../ext:../ext/native/ext"/>
</exec>

12
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -172,6 +172,16 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
}
}
@TargetApi(23)
public void sendInitialGrants() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
// Let's start out granted if it was granted already.
if (this.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
NativeApp.sendMessage("permission_granted", "storage");
}
}
}
@Override
public void onRequestPermissionsResult(int requestCode,
String permissions[], int[] grantResults) {
@ -239,6 +249,8 @@ public class NativeActivity extends Activity implements SurfaceHolder.Callback {
NativeApp.sendMessage("cacheDir", getCacheDir().getAbsolutePath());
sendInitialGrants();
vibrator = (Vibrator)getSystemService(VIBRATOR_SERVICE);
if (Build.VERSION.SDK_INT >= 11) {
checkForVibrator();