diff options
| author | Tsuwei Chen <tsuwei@google.com> | 2014-09-25 23:44:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 23:44:22 +0000 |
| commit | 023838f9e2562fcede3c3b6afae0e95b1a323196 (patch) | |
| tree | b69dc5688bfee3cea8521b6f330c13c0782f474f /location | |
| parent | 40c632b93176690f390121dd9f378cb2f491c3e1 (diff) | |
| parent | 43d5d896781d1481e01f3d658dc6dbae5bc03b74 (diff) | |
| download | frameworks_base-023838f9e2562fcede3c3b6afae0e95b1a323196.zip frameworks_base-023838f9e2562fcede3c3b6afae0e95b1a323196.tar.gz frameworks_base-023838f9e2562fcede3c3b6afae0e95b1a323196.tar.bz2 | |
am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'e6e4b2bfa3782f63ed0b4b802e5a9d59a6a48f49':
Fix an incorrect behavior that failed AT&T privacy test.
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, |