am b2ae0d6f: am e6e4b2bf: Merge "Fix an incorrect behavior that failed AT&T privacy test." into lmp-dev

* commit 'b2ae0d6f320d6f11f31cc82b03ac0fdf36220cc1': Fix an incorrect behavior that failed AT&T privacy test.
2014-09-25 22:56:43 +00:00
parent f2be7170bf 57b558d82a
commit 7bf6114c08
1 changed files with 1 additions and 1 deletions
--- 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,