diff options
| author | Tsuwei Chen <tsuwei@google.com> | 2014-09-25 22:43:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-25 22:43:04 +0000 |
| commit | 43d5d896781d1481e01f3d658dc6dbae5bc03b74 (patch) | |
| tree | 0a9f9ebdaca89a92a7f853e4b6fa89dc6b38fd1f /location | |
| parent | 625e8f595978693a079c4c20ac8d70e8710947e9 (diff) | |
| parent | 566ebfde2b3195ec5897a680c879241c46f33477 (diff) | |
| download | frameworks_base-43d5d896781d1481e01f3d658dc6dbae5bc03b74.zip frameworks_base-43d5d896781d1481e01f3d658dc6dbae5bc03b74.tar.gz frameworks_base-43d5d896781d1481e01f3d658dc6dbae5bc03b74.tar.bz2 | |
Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
Diffstat (limited to 'location')
| -rw-r--r-- | location/java/com/android/internal/location/GpsNetInitiatedHandler.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java index f0a2072..e9e475c 100644 --- a/location/java/com/android/internal/location/GpsNetInitiatedHandler.java +++ b/location/java/com/android/internal/location/GpsNetInitiatedHandler.java @@ -289,7 +289,7 @@ public class GpsNetInitiatedHandler { + " mPopupImmediately: " + mPopupImmediately + " mInEmergency: " + getInEmergency()); - if (getLocationEnabled() && !getInEmergency()) { + if (!getLocationEnabled() && !getInEmergency()) { // Location is currently disabled, ignore all NI requests. try { mNetInitiatedListener.sendNiResponse(notif.notificationId, |