mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-04 09:00:44 +00:00
Omar El Sheikh
c15078b900
Updated permissions for the renderdoccmd app based on which version of android the app is running on **WRITE_EXTERNAL_STORAGE for <R **MANAGE_EXTERNAL_STORAGE for >=R Updated the Java portion of renderdoccmd to check/request the correct permission based on android version Changed the file path for renderdoc files on Android based on the version of Android the connected device is running **/sdcard/Android/data/$PACKAGE_NAME for <R **/sdcard/Android/media/$PACKAGE_NAME for >=R
59 lines
2.2 KiB
Java
59 lines
2.2 KiB
Java
package @RENDERDOC_ANDROID_PACKAGE_NAME@;
|
|
import android.os.Build;
|
|
import android.app.Activity;
|
|
import android.view.WindowManager;
|
|
import android.os.Environment;
|
|
import android.content.Intent;
|
|
|
|
public class Loader extends android.app.NativeActivity
|
|
{
|
|
/* load our native library */
|
|
static {
|
|
System.loadLibrary("renderdoccmd"); // this will load VkLayer_GLES_RenderDoc as well
|
|
}
|
|
|
|
@Override
|
|
protected void onCreate(android.os.Bundle savedInstanceState) {
|
|
super.onCreate(savedInstanceState);
|
|
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
|
|
|
|
// if we're running on something older than Android M (6.0), return now
|
|
// before requesting permissions as it's not supported
|
|
if(Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
|
|
return;
|
|
|
|
String[] permission = new String[1];
|
|
if (Build.VERSION.SDK_INT < 30 /*Build.VERSION_CODES.R*/) {
|
|
permission[0] = android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
|
|
|
|
requestPermissions(permission, 1);
|
|
|
|
// Request is asynchronous, so prevent connection to server until permissions granted.
|
|
while(checkSelfPermission(permission[0])
|
|
!= android.content.pm.PackageManager.PERMISSION_GRANTED)
|
|
{
|
|
try {
|
|
Thread.sleep(1000);
|
|
} catch (InterruptedException e) {
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
permission[0] = "android.permission.MANAGE_EXTERNAL_STORAGE"; // android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
|
|
|
|
try {
|
|
java.lang.reflect.Method method = Environment.class.getMethod("isExternalStorageManager");
|
|
|
|
Boolean result = (Boolean)method.invoke(null);
|
|
|
|
// Popup a dialog if we haven't granted Android storage permissions.
|
|
if (!result) {
|
|
Intent viewIntent = new Intent( "android.settings.MANAGE_ALL_FILES_ACCESS_PERMISSION" /*android.provider.Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION*/);
|
|
startActivity(viewIntent);
|
|
}
|
|
} catch(Exception e) { }
|
|
}
|
|
}
|
|
}
|