diff --git a/android/phoenix/AndroidManifest.xml b/android/phoenix/AndroidManifest.xml
index e3e554a769..4cfb03ddd7 100644
--- a/android/phoenix/AndroidManifest.xml
+++ b/android/phoenix/AndroidManifest.xml
@@ -10,7 +10,7 @@
-
+
Display Name
Internal Name
Description
- Author(s)
+ Author(s)
Core License
- Manufacturer
+ Manufacturer
+ Permissions
Refresh rate calibration
diff --git a/android/phoenix/src/com/retroarch/browser/ModuleWrapper.java b/android/phoenix/src/com/retroarch/browser/ModuleWrapper.java
index 7a4aa1eea4..19c05e2ee6 100644
--- a/android/phoenix/src/com/retroarch/browser/ModuleWrapper.java
+++ b/android/phoenix/src/com/retroarch/browser/ModuleWrapper.java
@@ -24,6 +24,7 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable authors;
private final List supportedExtensions;
+ private final List permissions;
/**
* Constructor
@@ -89,6 +90,17 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable();
this.authors.add(emuAuthors);
}
+
+ final String permissions = infoFile.getString("permissions");
+ if (permissions != null && permissions.contains("|"))
+ {
+ this.permissions = new ArrayList(Arrays.asList(permissions.split("\\|")));
+ }
+ else
+ {
+ this.permissions = new ArrayList();
+ this.permissions.add(permissions);
+ }
}
else // No info file.
{
@@ -99,6 +111,7 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable();
this.supportedExtensions = new ArrayList();
this.coreName = coreName;
+ this.permissions = new ArrayList();
}
}
@@ -134,6 +147,7 @@ public final class ModuleWrapper implements IconAdapterItem, Comparable getEmulatorAuthors()
+ public List getAuthors()
{
return authors;
}
+ /**
+ * Gets the list of permissions of this core.
+ *
+ * @return the list of authors of this core.
+ */
+ public List getPermissions()
+ {
+ return permissions;
+ }
+
/**
* Gets the List of supported extensions for this core.
*
diff --git a/android/phoenix/src/com/retroarch/browser/coremanager/fragments/InstalledCoreInfoFragment.java b/android/phoenix/src/com/retroarch/browser/coremanager/fragments/InstalledCoreInfoFragment.java
index b857bef9c7..4e7b1e1a0b 100644
--- a/android/phoenix/src/com/retroarch/browser/coremanager/fragments/InstalledCoreInfoFragment.java
+++ b/android/phoenix/src/com/retroarch/browser/coremanager/fragments/InstalledCoreInfoFragment.java
@@ -56,9 +56,10 @@ public final class InstalledCoreInfoFragment extends ListFragment
adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_displayNameTitle), core.getDisplayName()));
adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_internalNameTitle), core.getInternalName()));
adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_systemNameTitle), core.getEmulatedSystemName()));
- adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_manufacterer), core.getManufacturer()));
- adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_emu_author), core.getEmulatorAuthors()));
+ adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_manufacturer), core.getManufacturer()));
+ adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_author), core.getAuthors()));
adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_licenseTitle), core.getCoreLicense()));
+ adapter.add(new InstalledCoreInfoItem(getString(R.string.core_info_permissions), core.getPermissions()));
// Set the list adapter.
infoView.setAdapter(adapter);
diff --git a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
index ea8a5b1cce..9413e50f6d 100644
--- a/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
+++ b/android/phoenix/src/com/retroarch/browser/preferences/util/UserPreferences.java
@@ -9,7 +9,7 @@ import java.io.InputStreamReader;
import android.annotation.TargetApi;
import android.content.Context;
import android.content.SharedPreferences;
-import android.content.pm.PackageManager;
+//import android.content.pm.PackageManager;
import android.media.AudioManager;
import android.media.AudioTrack;
import android.os.Build;
@@ -476,7 +476,7 @@ public final class UserPreferences
@TargetApi(17)
private static boolean hasLowLatencyAudio(Context ctx)
{
- PackageManager pm = ctx.getPackageManager();
+ //PackageManager pm = ctx.getPackageManager();
return true;//pm.hasSystemFeature(PackageManager.FEATURE_AUDIO_LOW_LATENCY);
}