Merge pull request #394 from phmagic/solo_follow_shot_update

Only send brake command for non-Solo shot follow

Author: m4gr3d

ServiceApp/src/org/droidplanner/services/android/core/gcs/follow/Follow.java

@@ -92,7 +92,9 @@ private void disableFollowMe() {
         }
 
         final MavLinkDrone drone = droneMgr.getDrone();
-        if (GuidedPoint.isGuidedMode(drone)) {
+        // Send a brake command only on APM Follow, Solo Shot follow braking is handled by its Shot Manager onboard
+        if (GuidedPoint.isGuidedMode(drone)
+                && followAlgorithm.getType() != FollowAlgorithm.FollowModes.SOLO_SHOT) {
             droneMgr.getDrone().executeAsyncAction(new Action(ControlActions.ACTION_SEND_BRAKE_VEHICLE), null);
         }
     }