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

Merge pull request #89703 from V-Sekai/android-fix 

Android: Fix UnsupportedOperationException remove from non-ArrayList
This commit is contained in:
Rémi Verschelde 2024-03-25 15:25:50 +01:00 committed by GitHub
parent 80a5da5242 3262363664
commit ccb1cb4845
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 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

@ -293,15 +293,15 @@ public final class PermissionsUtil {
/** /**
* Returns the permissions defined in the AndroidManifest.xml file. * Returns the permissions defined in the AndroidManifest.xml file.
* @param context the caller context for this method. * @param context the caller context for this method.
* @return manifest permissions list * @return mutable copy of manifest permissions list
* @throws PackageManager.NameNotFoundException the exception is thrown when a given package, application, or component name cannot be found. * @throws PackageManager.NameNotFoundException the exception is thrown when a given package, application, or component name cannot be found.
*/ */
public static List<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException { public static ArrayList<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException {
PackageManager packageManager = context.getPackageManager(); PackageManager packageManager = context.getPackageManager();
PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS); PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS);
if (packageInfo.requestedPermissions == null) if (packageInfo.requestedPermissions == null)
return Collections.emptyList(); return new ArrayList<String>();
return Arrays.asList(packageInfo.requestedPermissions); return new ArrayList<>(Arrays.asList(packageInfo.requestedPermissions));
} }
/** /**