maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #38468 from m4gr3d/fix_permissions_handling_bug

Browse source 
Address `OS.request_permissions()` bug when a non-platform permission is included
This commit is contained in:
Rémi Verschelde 2020-05-05 13:29:07 +02:00 committed by GitHub
parent e1b4c771ce ef62506e5c
commit fa0c347c86
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -36,6 +36,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PermissionInfo;
import android.os.Build;
import android.support.v4.content.ContextCompat;
import android.util.Log;
import java.util.ArrayList;
import java.util.List;
import org.godotengine.godot.Godot;
@ -46,6 +47,8 @@ import org.godotengine.godot.Godot;
*/
public final class PermissionsUtil {
private static final String TAG = PermissionsUtil.class.getSimpleName();
static final int REQUEST_RECORD_AUDIO_PERMISSION = 1;
static final int REQUEST_CAMERA_PERMISSION = 2;
static final int REQUEST_VIBRATE_PERMISSION = 3;
@ -113,8 +116,8 @@ public final class PermissionsUtil {
dangerousPermissions.add(manifestPermission);
}
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return false;
// Skip this permission and continue.
Log.w(TAG, "Unable to identify permission " + manifestPermission, e);
}
}
@ -153,8 +156,8 @@ public final class PermissionsUtil {
dangerousPermissions.add(manifestPermission);
}
} catch (PackageManager.NameNotFoundException e) {
e.printStackTrace();
return new String[0];
// Skip this permission and continue.
Log.w(TAG, "Unable to identify permission " + manifestPermission, e);
}
}