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

am: 2ffd98670f

Change-Id: I7f57683e774109f301e0763607853674c6fda9c9

services/core/java/com/android/server/location/GnssLocationProvider.java

@@ -778,6 +778,18 @@ public class GnssLocationProvider implements LocationProviderInterface {
                 return isEnabled();
             }
         };
+
+        /*
+        * 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();
+        }
     }
 
     /**