commit 75a2ae937f5354a3432d0a2382e98177bd9b80d5
author Mike Lockwood <lockwood@android.com> Tue Aug 31 13:56:00 2010 -0700
committer Android Code Review <code-review@android.com> Tue Aug 31 13:56:00 2010 -0700
tree ffff4347c0ed6aa6674f0efb7275db55f98d83fe
parent 9e64fcb5b5b27427ab6bb11eef174b1424ea78f9
parent b445946deaad61fc3acaf4760a135fb92d0547b0

Merge "GPS: Initialize XTRA support when GPS is enabled"

location/java/com/android/internal/location/GpsLocationProvider.java

diff --git a/location/java/com/android/internal/location/GpsLocationProvider.java b/location/java/com/android/internal/location/GpsLocationProvider.java
index c3dddad..ab79147 100755
--- a/location/java/com/android/internal/location/GpsLocationProvider.java
+++ b/location/java/com/android/internal/location/GpsLocationProvider.java
@@ -216,6 +216,9 @@
     // true if we started navigation
     private boolean mStarted;
 
+    // true if XTRA is supported
+    private boolean mSupportsXtra;
+
     // for calculating time to first fix
     private long mFixRequestTime = 0;
     // time to first fix for most recent session
@@ -659,6 +662,7 @@
         mEnabled = native_init();
 
         if (mEnabled) {
+            mSupportsXtra = native_supports_xtra();
             if (mSuplServerHost != null) {
                 native_set_agps_server(AGPS_TYPE_SUPL, mSuplServerHost, mSuplServerPort);
             }
@@ -860,7 +864,7 @@
             return true;
         }
         if ("force_xtra_injection".equals(command)) {
-            if (native_supports_xtra()) {
+            if (mSupportsXtra) {
                 xtraDownloadRequest();
                 return true;
             }
@@ -1383,7 +1387,7 @@
                     handleInjectNtpTime();
                     break;
                 case DOWNLOAD_XTRA_DATA:
-                    if (native_supports_xtra()) {
+                    if (mSupportsXtra) {
                         handleDownloadXtraData();
                     }
                     break;