Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed opening audio on Android from the Steam Link shell activity
  • Loading branch information
slouken committed Feb 14, 2020
1 parent b431286 commit 14bf532
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
16 changes: 3 additions & 13 deletions android-project/app/src/main/java/org/libsdl/app/SDLActivity.java
Expand Up @@ -1606,24 +1606,14 @@ public static boolean setSystemCursor(int cursorID) {
* This method is called by SDL using JNI.
*/
public static void requestPermission(String permission, int requestCode) {
if (mSingleton != null) {
mSingleton.checkPermission(permission, requestCode);
} else {
nativePermissionResult(requestCode, false);
}
}

/**
* This can be overridden
*/
public void checkPermission(String permission, int requestCode) {
if (Build.VERSION.SDK_INT < 23) {
nativePermissionResult(requestCode, true);
return;
}

if (this.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
this.requestPermissions(new String[]{permission}, requestCode);
Activity activity = (Activity)getContext();
if (activity.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
activity.requestPermissions(new String[]{permission}, requestCode);
} else {
nativePermissionResult(requestCode, true);
}
Expand Down
1 change: 1 addition & 0 deletions src/audio/openslES/SDL_openslES.c
Expand Up @@ -234,6 +234,7 @@ openslES_CreatePCMRecorder(_THIS)
int i;

if (!Android_JNI_RequestPermission("android.permission.RECORD_AUDIO")) {
LOGE("This app doesn't have RECORD_AUDIO permission");
return SDL_SetError("This app doesn't have RECORD_AUDIO permission");
}

Expand Down

0 comments on commit 14bf532

Please sign in to comment.