Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-23 13:30:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Can't use the camera stuff on Android versions before 11. Fixes #10029.

Browse Source
This commit is contained in:
Henrik Rydgård 2017-10-24 15:38:16 +02:00
parent f53b455dce
commit 2c8fb0fbd1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GPU/GPUCommon.h
View File

@ -183,7 +183,7 @@ public:
std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override { std::string DebugGetShaderString(std::string id, DebugShaderType shader, DebugShaderStringType stringType) override {
return "N/A"; return "N/A";
} }
bool DescribeCodePtr(const u8 *ptr, std::string &name); bool DescribeCodePtr(const u8 *ptr, std::string &name) override;
std::vector<DisplayList> ActiveDisplayLists() override; std::vector<DisplayList> ActiveDisplayLists() override;
void ResetListPC(int listID, u32 pc) override; void ResetListPC(int listID, u32 pc) override;
@ -227,7 +227,7 @@ public:
bool DecodeTexture(u8* dest, const GPUgstate &state) override { bool DecodeTexture(u8* dest, const GPUgstate &state) override {
return false; return false;
} }
std::vector<FramebufferInfo> GetFramebufferList(); std::vector<FramebufferInfo> GetFramebufferList() override;
void ClearShaderCache() override {} void ClearShaderCache() override {}
void CleanupBeforeUI() override {} void CleanupBeforeUI() override {}

11
android/src/org/ppsspp/ppsspp/NativeActivity.java
View File

@ -226,7 +226,7 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
} }
break; break;
case REQUEST_CODE_CAMERA_PERMISSION: case REQUEST_CODE_CAMERA_PERMISSION:
if (permissionsGranted(permissions, grantResults)) { if (mCameraHelper != null && permissionsGranted(permissions, grantResults)) {
mCameraHelper.startCamera(); mCameraHelper.startCamera();
} }
break; break;
@ -332,7 +332,10 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
} }
mLocationHelper = new LocationHelper(this); mLocationHelper = new LocationHelper(this);
mCameraHelper = new CameraHelper(this); if (Build.VERSION.SDK_INT >= 11) {
// android.graphics.SurfaceTexture is not available before version 11.
mCameraHelper = new CameraHelper(this);
}
} }
@TargetApi(24) @TargetApi(24)
@ -1209,10 +1212,10 @@ public abstract class NativeActivity extends Activity implements SurfaceHolder.C
} }
} else if (command.equals("camera_command")) { } else if (command.equals("camera_command")) {
if (params.equals("startVideo")) { if (params.equals("startVideo")) {
if (!askForPermissions(permissionsForCamera, REQUEST_CODE_CAMERA_PERMISSION)) { if (mCameraHelper != null && !askForPermissions(permissionsForCamera, REQUEST_CODE_CAMERA_PERMISSION)) {
mCameraHelper.startCamera(); mCameraHelper.startCamera();
} }
} else if (params.equals("stopVideo")) { } else if (mCameraHelper != null && params.equals("stopVideo")) {
mCameraHelper.stopCamera(); mCameraHelper.stopCamera();
} }
} }