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

Android: Fix UnsupportedOperationException remove from non-ArrayList
godotengine · Mar 25, 2024 · ccb1cb4 · ccb1cb4
2 parents 80a5da5 + 3262363
commit ccb1cb4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java b/platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java
@@ -293,15 +293,15 @@ public static boolean hasManifestPermission(Context context, String permission)
 	/**
 	 * Returns the permissions defined in the AndroidManifest.xml file.
 	 * @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.
 	 */
-	public static List<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException {
+	public static ArrayList<String> getManifestPermissions(Context context) throws PackageManager.NameNotFoundException {
 		PackageManager packageManager = context.getPackageManager();
 		PackageInfo packageInfo = packageManager.getPackageInfo(context.getPackageName(), PackageManager.GET_PERMISSIONS);
 		if (packageInfo.requestedPermissions == null)
-			return Collections.emptyList();
-		return Arrays.asList(packageInfo.requestedPermissions);
+			return new ArrayList<String>();
+		return new ArrayList<>(Arrays.asList(packageInfo.requestedPermissions));
 	}
 
 	/**