2
0
Эх сурвалжийг харах

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

Android: Fix UnsupportedOperationException remove from non-ArrayList
Rémi Verschelde 1 жил өмнө
parent
commit
ccb1cb4845

+ 4 - 4
platform/android/java/lib/src/org/godotengine/godot/utils/PermissionsUtil.java

@@ -293,15 +293,15 @@ public final class PermissionsUtil {
 	/**
 	 * 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));
 	}
 
 	/**