asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix crash on Android with no manifest permissions.

Browse source 
API allows for null array of permissions. It is now normalized with an
empty array.
This commit is contained in:
Fabio Alessandrelli 2019-12-17 14:22:15 +01:00
parent d8d96c9fa7
commit ca19a3fe9a
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java
View file

@ -101,7 +101,7 @@ public final class PermissionsUtil {
return false;
}
if (manifestPermissions == null || manifestPermissions.length == 0)
if (manifestPermissions.length == 0)
return true;
List<String> dangerousPermissions = new ArrayList<>();
@ -141,8 +141,8 @@ public final class PermissionsUtil {
e.printStackTrace();
return new String[0];
}
if (manifestPermissions == null || manifestPermissions.length == 0)
return new String[0];
if (manifestPermissions.length == 0)
return manifestPermissions;
List<String> dangerousPermissions = new ArrayList<>();
for (String manifestPermission : manifestPermissions) {
@ -188,6 +188,8 @@ public final class PermissionsUtil {
private static String[] getManifestPermissions(Godot activity) throws PackageManager.NameNotFoundException {
PackageManager packageManager = activity.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(activity.getPackageName(), PackageManager.GET_PERMISSIONS);
if (packageInfo.requestedPermissions == null)
return new String[0];
return packageInfo.requestedPermissions;
}