commit 2e6c5f1acc2149c732a4dbd54abfa2c773d6d797
author Tsuwei Chen <tsuwei@google.com> Fri Sep 26 04:29:47 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 26 04:29:47 2014 +0000
tree 01eafe7fe2e5620b8f0f4ebcd3493c1621b1f032
parent d99db031ea0ff1fe93c924573f70eae8cd6f8edb
parent 69822632560413bd1abfc7e3b35307fcef2739ad

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.

location/java/com/android/internal/location/GpsNetInitiatedHandler.java

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 @@
                         + " mPopupImmediately: " + mPopupImmediately
                         + " mInEmergency: " + getInEmergency());
 
-        if (getLocationEnabled() && !getInEmergency()) {
+        if (!getLocationEnabled() && !getInEmergency()) {
             // Location is currently disabled, ignore all NI requests.
             try {
                 mNetInitiatedListener.sendNiResponse(notif.notificationId,