mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-01 13:20:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "(Android) Backport c9218bbd23"

Browse Source 
This reverts commit 6e4c8ec6a61e6148765dcc6216005cb1c6be9268.
This commit is contained in:
twinaphex 2019-06-27 17:55:19 +02:00
parent 01c489eee0
commit 8037cbe3dc
4 changed files with 36 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deps/dr/dr_flac.h vendored
View File

@ -667,7 +667,7 @@ const char* drflac_next_vorbis_comment(drflac_vorbis_comment_iterator* pIter, dr
#define DRFLAC_NO_CPUID
#endif
#else
#if (defined(__GNUC__) || defined(__clang__)) && !defined(__ANDROID__)
#if defined(__GNUC__) || defined(__clang__)
static void drflac__cpuid(int info[4], int fid)
{
__asm__ __volatile__ (

8
pkg/android/phoenix/src/com/retroarch/browser/mainmenu/MainMenuActivity.java
View File

@ -42,8 +42,6 @@ public final class MainMenuActivity extends PreferenceActivity
private boolean addPermission(List<String> permissionsList, String permission)
{
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
{
if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED)
{
permissionsList.add(permission);
@ -51,7 +49,6 @@ public final class MainMenuActivity extends PreferenceActivity
// Check for Rationale Option
if (!shouldShowRequestPermissionRationale(permission))
return false;
}
}
return true;
@ -59,7 +56,7 @@ public final class MainMenuActivity extends PreferenceActivity
public void checkRuntimePermissions()
{
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
if (android.os.Build.VERSION.SDK_INT >= 23)
{
// Android 6.0+ needs runtime permission checks
List<String> permissionsNeeded = new ArrayList<String>();
@ -92,13 +89,10 @@ public final class MainMenuActivity extends PreferenceActivity
{
if (which == AlertDialog.BUTTON_POSITIVE)
{
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M)
{
requestPermissions(permissionsList.toArray(new String[permissionsList.size()]),
REQUEST_CODE_ASK_MULTIPLE_PERMISSIONS);
Log.i("MainMenuActivity", "User accepted request for external storage permissions.");
}
}
}
});

5
pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityCommon.java
View File

@ -49,8 +49,6 @@ public class RetroActivityCommon extends RetroActivityLocation
long[] pattern = {16};
int[] strengths = {strength};
if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN)
{
if (id == -1)
vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);
else
@ -60,7 +58,6 @@ public class RetroActivityCommon extends RetroActivityLocation
if (dev != null)
vibrator = dev.getVibrator();
}
}
if (vibrator == null)
return;
@ -75,7 +72,7 @@ public class RetroActivityCommon extends RetroActivityLocation
else
pattern[0] = 1000;
if (Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
if (Build.VERSION.SDK_INT >= 26) {
if (id >= 0)
Log.i("RetroActivity", "Vibrate id " + id + ": strength " + strength);

4
pkg/android/phoenix/src/com/retroarch/browser/retroactivity/RetroActivityFuture.java
View File

@ -40,8 +40,6 @@ public final class RetroActivityFuture extends RetroActivityCamera {
// Check for Android UI specific parameters
Intent retro = getIntent();
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP) {
String refresh = retro.getStringExtra("REFRESH");
// If REFRESH parameter is provided then try to set refreshrate accordingly
@ -50,7 +48,6 @@ public final class RetroActivityFuture extends RetroActivityCamera {
params.preferredRefreshRate = Integer.parseInt(refresh);
getWindow().setAttributes(params);
}
}
// If QUITFOCUS parameter is provided then enable that Retroarch quits when focus is lost
quitfocus = retro.hasExtra("QUITFOCUS");
@ -64,7 +61,6 @@ public final class RetroActivityFuture extends RetroActivityCamera {
public void hideMouseCursor() {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) {
// Check for NVIDIA extensions and minimum SDK version
Method mInputManager_setCursorVisibility;
try { mInputManager_setCursorVisibility =