diff options
| author | Tsuwei Chen <tsuwei@google.com> | 2014-09-25 23:09:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-25 23:09:34 +0000 |
| commit | 69822632560413bd1abfc7e3b35307fcef2739ad (patch) | |
| tree | 1bd573c64a57adb9dc9e372d1bddd7dfa95301b3 /location | |
| parent | f8b1d1320abb57f5dde942d220ceee70a63def3e (diff) | |
| parent | 7bf6114c0838bbf95a0709a9360d346a96359ac7 (diff) | |
| download | frameworks_base-69822632560413bd1abfc7e3b35307fcef2739ad.zip frameworks_base-69822632560413bd1abfc7e3b35307fcef2739ad.tar.gz frameworks_base-69822632560413bd1abfc7e3b35307fcef2739ad.tar.bz2 | |
am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'f4ada994f91bcdfcb421d76faa8ea84540815e7c':
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, |