diff options
Diffstat (limited to 'services/java')
3 files changed, 15 insertions, 5 deletions
diff --git a/services/java/com/android/server/LocationManagerService.java b/services/java/com/android/server/LocationManagerService.java index fe1b231..8644ceb 100644 --- a/services/java/com/android/server/LocationManagerService.java +++ b/services/java/com/android/server/LocationManagerService.java @@ -89,7 +89,7 @@ import java.util.Set; */ public class LocationManagerService extends ILocationManager.Stub implements Runnable { private static final String TAG = "LocationManagerService"; - private static final boolean LOCAL_LOGV = true; + private static final boolean LOCAL_LOGV = false; // The last time a location was written, by provider name. private HashMap<String,Long> mLastWriteTime = new HashMap<String,Long>(); @@ -1674,6 +1674,9 @@ public class LocationManagerService extends ILocationManager.Stub implements Run } public Location getLastKnownLocation(String provider) { + if (LOCAL_LOGV) { + Slog.v(TAG, "getLastKnownLocation: " + provider); + } try { synchronized (mLock) { return _getLastKnownLocationLocked(provider); diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java index fadbb34..b0e30f9 100644 --- a/services/java/com/android/server/PowerManagerService.java +++ b/services/java/com/android/server/PowerManagerService.java @@ -2354,6 +2354,14 @@ class PowerManagerService extends IPowerManager.Stub Slog.d(TAG, "lightSensorChangedLocked " + value); } + // Don't do anything if the screen is off. + if ((mPowerState & SCREEN_ON_BIT) == 0) { + if (mDebugLightSensor) { + Slog.d(TAG, "dropping lightSensorChangedLocked because screen is off"); + } + return; + } + // do not allow light sensor value to decrease if (mHighestLightSensorValue < value) { mHighestLightSensorValue = value; diff --git a/services/java/com/android/server/location/GpsLocationProvider.java b/services/java/com/android/server/location/GpsLocationProvider.java index 755a228..3561862 100755 --- a/services/java/com/android/server/location/GpsLocationProvider.java +++ b/services/java/com/android/server/location/GpsLocationProvider.java @@ -82,7 +82,7 @@ public class GpsLocationProvider implements LocationProviderInterface { private static final String TAG = "GpsLocationProvider"; - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; private static final boolean VERBOSE = false; // these need to match GpsPositionMode enum in gps.h @@ -1250,7 +1250,7 @@ public class GpsLocationProvider implements LocationProviderInterface { native_agps_data_conn_failed(); } } else if (result == Phone.APN_REQUEST_STARTED) { - if (DEBUG) Log.d(TAG, "Phone.APN_ALREADYAPN_REQUEST_STARTED_ACTIVE"); + if (DEBUG) Log.d(TAG, "Phone.APN_REQUEST_STARTED"); // Nothing to do here } else { if (DEBUG) Log.d(TAG, "startUsingNetworkFeature failed"); @@ -1492,8 +1492,7 @@ public class GpsLocationProvider implements LocationProviderInterface { private final class ProviderHandler extends Handler { @Override - public void handleMessage(Message msg) - { + public void handleMessage(Message msg) { int message = msg.what; switch (message) { case ENABLE: |