godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34401 from Faless/android/fix_get_manifest_permissions

Browse Source 
Fix crash on Android with no manifest permissions.
This commit is contained in:
Rémi Verschelde 2019-12-17 15:03:16 +01:00 committed by GitHub
commit fbc176d740
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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; return false;
} }
if (manifestPermissions == null || manifestPermissions.length == 0) if (manifestPermissions.length == 0)
return true; return true;
List<String> dangerousPermissions = new ArrayList<>(); List<String> dangerousPermissions = new ArrayList<>();
@ -141,8 +141,8 @@ public final class PermissionsUtil {
e.printStackTrace(); e.printStackTrace();
return new String[0]; return new String[0];
} }
if (manifestPermissions == null || manifestPermissions.length == 0) if (manifestPermissions.length == 0)
return new String[0]; return manifestPermissions;
List<String> dangerousPermissions = new ArrayList<>(); List<String> dangerousPermissions = new ArrayList<>();
for (String manifestPermission : manifestPermissions) { for (String manifestPermission : manifestPermissions) {
@ -188,6 +188,8 @@ public final class PermissionsUtil {
private static String[] getManifestPermissions(Godot activity) throws PackageManager.NameNotFoundException { private static String[] getManifestPermissions(Godot activity) throws PackageManager.NameNotFoundException {
PackageManager packageManager = activity.getPackageManager(); PackageManager packageManager = activity.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(activity.getPackageName(), PackageManager.GET_PERMISSIONS); PackageInfo packageInfo = packageManager.getPackageInfo(activity.getPackageName(), PackageManager.GET_PERMISSIONS);
if (packageInfo.requestedPermissions == null)
return new String[0];
return packageInfo.requestedPermissions; return packageInfo.requestedPermissions;
} }