operator change
This commit is contained in:
parent
c569ab798c
commit
0bd64e4a53
@ -189,7 +189,7 @@ public class LocationProvider
|
|||||||
/*
|
/*
|
||||||
Due to strange factors the time difference might be 0 resulting in mathematical error.
|
Due to strange factors the time difference might be 0 resulting in mathematical error.
|
||||||
*/
|
*/
|
||||||
if (Double.isInfinite(currentSpeed) | Double.isNaN(currentSpeed))
|
if (Double.isInfinite(currentSpeed) || Double.isNaN(currentSpeed))
|
||||||
Miscellaneous.logEvent("i", "Speed", "Error while calculating speed.", 4);
|
Miscellaneous.logEvent("i", "Speed", "Error while calculating speed.", 4);
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -240,7 +240,7 @@ public class LocationProvider
|
|||||||
|
|
||||||
if(Settings.positioningEngine == 0)
|
if(Settings.positioningEngine == 0)
|
||||||
{
|
{
|
||||||
if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed))
|
if(Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) || Rule.isAnyRuleUsing(Trigger_Enum.speed))
|
||||||
{
|
{
|
||||||
// startCellLocationChangedReceiver
|
// startCellLocationChangedReceiver
|
||||||
if (CellLocationChangedReceiver.isCellLocationChangedReceiverPossible())
|
if (CellLocationChangedReceiver.isCellLocationChangedReceiverPossible())
|
||||||
@ -424,7 +424,7 @@ public class LocationProvider
|
|||||||
}
|
}
|
||||||
|
|
||||||
// *********** RULE CHANGES ***********
|
// *********** RULE CHANGES ***********
|
||||||
if(!CellLocationChangedReceiver.isCellLocationListenerActive() && (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) | Rule.isAnyRuleUsing(Trigger_Enum.speed)))
|
if(!CellLocationChangedReceiver.isCellLocationListenerActive() && (Rule.isAnyRuleUsing(Trigger_Enum.pointOfInterest) || Rule.isAnyRuleUsing(Trigger_Enum.speed)))
|
||||||
{
|
{
|
||||||
Miscellaneous.logEvent("i", "LocationProvider", "Starting NoiseListener CellLocationChangedReceiver because used in a new/changed rule.", 4);
|
Miscellaneous.logEvent("i", "LocationProvider", "Starting NoiseListener CellLocationChangedReceiver because used in a new/changed rule.", 4);
|
||||||
if(CellLocationChangedReceiver.haveAllPermission())
|
if(CellLocationChangedReceiver.haveAllPermission())
|
||||||
|
Loading…
Reference in New Issue
Block a user