diff options
| author | Tsuwei Chen <tsuwei@google.com> | 2014-09-26 04:29:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-26 04:29:47 +0000 |
| commit | 2e6c5f1acc2149c732a4dbd54abfa2c773d6d797 (patch) | |
| tree | 01eafe7fe2e5620b8f0f4ebcd3493c1621b1f032 /location | |
| parent | d99db031ea0ff1fe93c924573f70eae8cd6f8edb (diff) | |
| parent | 69822632560413bd1abfc7e3b35307fcef2739ad (diff) | |
| download | frameworks_base-2e6c5f1acc2149c732a4dbd54abfa2c773d6d797.zip frameworks_base-2e6c5f1acc2149c732a4dbd54abfa2c773d6d797.tar.gz frameworks_base-2e6c5f1acc2149c732a4dbd54abfa2c773d6d797.tar.bz2 | |
am df9e62f0: am f4ada994: am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev
* commit 'df9e62f058e6e8f9a5853460d9c916fe5dfae751':
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, |