Merge "Emergency SUPL when location is disabled" into oc-dr1-dev

2017-06-22 22:59:41 +00:00
parent 2e8351b308 fff3a9d791
commit 424e517d5d
1 changed files with 12 additions and 0 deletions
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -789,6 +789,18 @@ public class GnssLocationProvider implements LocationProviderInterface {
            }
        };
        mGnssMetrics = new GnssMetrics();
+
+        /*
+        * A cycle of native_init() and native_cleanup() is needed so that callbacks are registered
+        * after bootup even when location is disabled. This will allow Emergency SUPL to work even
+        * when location is disabled before device restart.
+        * */
+        boolean isInitialized = native_init();
+        if(!isInitialized) {
+            Log.d(TAG, "Failed to initialize at bootup");
+        } else {
+            native_cleanup();
+        }
    }

    /**