Permalink
Browse files

Merge pull request #9983 from hrydgard/buildbot-fix

Fix the build on the buildbot by avoiding fancy new Java features.
  • Loading branch information...
hrydgard committed Sep 27, 2017
2 parents d36fdd6 + 271a3bb commit a38e903479722e5515d6b1b36fc5d902854f06c6
Showing with 12 additions and 18 deletions.
  1. +12 −18 android/src/org/ppsspp/ppsspp/NativeActivity.java
@@ -1200,26 +1200,20 @@ public boolean processCommand(String command, String params) {
NativeApp.sendMessage("permission_granted", "storage");
}
} else if (command.equals("gps_command")) {
switch (params) {
case "open":
if(!askForPermissions(permissionsForLocation, REQUEST_CODE_LOCATION_PERMISSION)) {
mLocationHelper.startLocationUpdates();
}
break;
case "close":
mLocationHelper.stopLocationUpdates();
break;
if (params.equals("open")) {
if (!askForPermissions(permissionsForLocation, REQUEST_CODE_LOCATION_PERMISSION)) {
mLocationHelper.startLocationUpdates();
}
} else if (params.equals("close")) {
mLocationHelper.stopLocationUpdates();
}
} else if (command.equals("camera_command")) {
switch (params) {
case "startVideo":
if(!askForPermissions(permissionsForCamera, REQUEST_CODE_CAMERA_PERMISSION)) {
mCameraHelper.startCamera();
}
break;
case "stopVideo":
mCameraHelper.stopCamera();
break;
if (params.equals("startVideo")) {
if (!askForPermissions(permissionsForCamera, REQUEST_CODE_CAMERA_PERMISSION)) {
mCameraHelper.startCamera();
}
} else if (params.equals("stopVideo")) {
mCameraHelper.stopCamera();
}
}
return false;

0 comments on commit a38e903

Please sign in to comment.