Fix aidl compilation
This commit is contained in:
parent
49d5016419
commit
53e0153163
4 changed files with 8 additions and 7 deletions
|
@ -90,6 +90,7 @@ import net.osmand.aidl.contextmenu.ContextMenuButtonsParams;
|
||||||
import net.osmand.aidl.contextmenu.UpdateContextMenuButtonsParams;
|
import net.osmand.aidl.contextmenu.UpdateContextMenuButtonsParams;
|
||||||
import net.osmand.aidl.contextmenu.RemoveContextMenuButtonsParams;
|
import net.osmand.aidl.contextmenu.RemoveContextMenuButtonsParams;
|
||||||
|
|
||||||
|
import net.osmand.aidl.mapmarker.RemoveMapMarkersParams;
|
||||||
|
|
||||||
// NOTE: Add new methods at the end of file!!!
|
// NOTE: Add new methods at the end of file!!!
|
||||||
|
|
||||||
|
@ -829,5 +830,5 @@ interface IOsmAndAidlInterface {
|
||||||
* Removes all active map markers (marks them as passed and moves to history)
|
* Removes all active map markers (marks them as passed and moves to history)
|
||||||
* Empty class of params
|
* Empty class of params
|
||||||
*/
|
*/
|
||||||
boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams);
|
boolean removeAllActiveMapMarkers(in RemoveMapMarkersParams params);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1057,7 +1057,7 @@ public class OsmandAidlApi {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean removeAllMapMarkers() {
|
boolean removeAllActiveMapMarkers() {
|
||||||
boolean refreshNeeded = false;
|
boolean refreshNeeded = false;
|
||||||
MapMarkersHelper markersHelper = app.getMapMarkersHelper();
|
MapMarkersHelper markersHelper = app.getMapMarkersHelper();
|
||||||
List<MapMarker> mapMarkers = markersHelper.getMapMarkers();
|
List<MapMarker> mapMarkers = markersHelper.getMapMarkers();
|
||||||
|
|
|
@ -49,6 +49,7 @@ import net.osmand.aidl.maplayer.point.ShowMapPointParams;
|
||||||
import net.osmand.aidl.maplayer.point.UpdateMapPointParams;
|
import net.osmand.aidl.maplayer.point.UpdateMapPointParams;
|
||||||
import net.osmand.aidl.mapmarker.AddMapMarkerParams;
|
import net.osmand.aidl.mapmarker.AddMapMarkerParams;
|
||||||
import net.osmand.aidl.mapmarker.RemoveMapMarkerParams;
|
import net.osmand.aidl.mapmarker.RemoveMapMarkerParams;
|
||||||
|
import net.osmand.aidl.mapmarker.RemoveMapMarkersParams;
|
||||||
import net.osmand.aidl.mapmarker.UpdateMapMarkerParams;
|
import net.osmand.aidl.mapmarker.UpdateMapMarkerParams;
|
||||||
import net.osmand.aidl.mapwidget.AddMapWidgetParams;
|
import net.osmand.aidl.mapwidget.AddMapWidgetParams;
|
||||||
import net.osmand.aidl.mapwidget.RemoveMapWidgetParams;
|
import net.osmand.aidl.mapwidget.RemoveMapWidgetParams;
|
||||||
|
@ -75,7 +76,6 @@ import net.osmand.aidl.search.SearchParams;
|
||||||
import net.osmand.aidl.search.SearchResult;
|
import net.osmand.aidl.search.SearchResult;
|
||||||
import net.osmand.aidl.tiles.ASqliteDbFile;
|
import net.osmand.aidl.tiles.ASqliteDbFile;
|
||||||
import net.osmand.plus.OsmandApplication;
|
import net.osmand.plus.OsmandApplication;
|
||||||
import net.osmand.plus.routing.VoiceRouter;
|
|
||||||
import net.osmand.util.Algorithms;
|
import net.osmand.util.Algorithms;
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
|
@ -1165,10 +1165,10 @@ public class OsmandAidlService extends Service implements AidlCallbackListener {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean removeAllMapMarkers() {
|
public boolean removeAllActiveMapMarkers(RemoveMapMarkersParams params) {
|
||||||
try {
|
try {
|
||||||
OsmandAidlApi api = getApi("removeAllMapMarkers");
|
OsmandAidlApi api = getApi("removeAllActiveMapMarkers");
|
||||||
return api != null && api.removeAllMapMarkers();
|
return api != null && api.removeAllActiveMapMarkers();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
handleException(e);
|
handleException(e);
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
package net.osmand.aidl.mapmarker;
|
package net.osmand.aidl.mapmarker;
|
||||||
|
|
||||||
parcelable RemoveMapMarkerParams;
|
parcelable RemoveMapMarkersParams;
|
Loading…
Reference in a new issue