auto import from //branches/cupcake_rel/...@140373

3 files changed, 34 insertions, 39 deletions

diff --git a/core/jni/android_location_GpsLocationProvider.cpp b/core/jni/android_location_GpsLocationProvider.cpp
index dee3fdd..f0b35e9 100644
--- a/core/jni/android_location_GpsLocationProvider.cpp
+++ b/core/jni/android_location_GpsLocationProvider.cpp
@@ -35,6 +35,7 @@ static jmethodID method_xtraDownloadRequest;
 
 static const GpsInterface* sGpsInterface = NULL;
 static const GpsXtraInterface* sGpsXtraInterface = NULL;
+static const GpsSuplInterface* sGpsSuplInterface = NULL;
 
 // data written to by GPS callbacks
 static GpsLocation  sGpsLocation;
@@ -144,9 +145,10 @@ static void android_location_GpsLocationProvider_cleanup(JNIEnv* env, jobject ob
     sGpsInterface->cleanup();
 }
 
-static jboolean android_location_GpsLocationProvider_start(JNIEnv* env, jobject obj, jboolean singleFix, jint fixFrequency)
+static jboolean android_location_GpsLocationProvider_start(JNIEnv* env, jobject obj, jint positionMode, 
+        jboolean singleFix, jint fixFrequency)
 {
-    int result = sGpsInterface->set_position_mode(GPS_POSITION_MODE_STANDALONE, (singleFix ? 0 : fixFrequency));
+    int result = sGpsInterface->set_position_mode(positionMode, (singleFix ? 0 : fixFrequency));
     if (result) {
         return result;
     }
@@ -267,6 +269,33 @@ static void android_location_GpsLocationProvider_inject_xtra_data(JNIEnv* env, j
     env->ReleaseByteArrayElements(data, bytes, 0);
 }
 
+static void android_location_GpsLocationProvider_set_supl_server(JNIEnv* env, jobject obj,
+        jint addr, jint port)
+{
+    if (!sGpsSuplInterface) {
+        sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
+    }
+    if (sGpsSuplInterface) {
+        sGpsSuplInterface->set_server(addr, port);
+    }
+}
+
+static void android_location_GpsLocationProvider_set_supl_apn(JNIEnv* env, jobject obj, jstring apn)
+{
+    if (!sGpsSuplInterface) {
+        sGpsSuplInterface = (const GpsSuplInterface*)sGpsInterface->get_extension(GPS_SUPL_INTERFACE);
+    }
+    if (sGpsSuplInterface) {
+        if (apn == NULL) {
+            jniThrowException(env, "java/lang/IllegalArgumentException", NULL);
+            return;
+        }
+        const char *apnStr = env->GetStringUTFChars(apn, NULL);
+        sGpsSuplInterface->set_apn(apnStr);
+        env->ReleaseStringUTFChars(apn, apnStr);
+    }
+}
+
 static JNINativeMethod sMethods[] = {
      /* name, signature, funcPtr */
     {"class_init_native", "()V", (void *)android_location_GpsLocationProvider_class_init_native},
@@ -274,7 +303,7 @@ static JNINativeMethod sMethods[] = {
 	{"native_init", "()Z", (void*)android_location_GpsLocationProvider_init},
 	{"native_disable", "()V", (void*)android_location_GpsLocationProvider_disable},
 	{"native_cleanup", "()V", (void*)android_location_GpsLocationProvider_cleanup},
-	{"native_start", "(ZI)Z", (void*)android_location_GpsLocationProvider_start},
+	{"native_start", "(IZI)Z", (void*)android_location_GpsLocationProvider_start},
 	{"native_stop", "()Z", (void*)android_location_GpsLocationProvider_stop},
 	{"native_set_fix_frequency", "(I)V", (void*)android_location_GpsLocationProvider_set_fix_frequency},
 	{"native_delete_aiding_data", "(I)V", (void*)android_location_GpsLocationProvider_delete_aiding_data},
@@ -283,6 +312,8 @@ static JNINativeMethod sMethods[] = {
 	{"native_inject_time", "(JJI)V", (void*)android_location_GpsLocationProvider_inject_time},
 	{"native_supports_xtra", "()Z", (void*)android_location_GpsLocationProvider_supports_xtra},
 	{"native_inject_xtra_data", "([BI)V", (void*)android_location_GpsLocationProvider_inject_xtra_data},
+ 	{"native_set_supl_server", "(II)V", (void*)android_location_GpsLocationProvider_set_supl_server},
+ 	{"native_set_supl_apn", "(Ljava/lang/String;)V", (void*)android_location_GpsLocationProvider_set_supl_apn},
 };
 
 int register_android_location_GpsLocationProvider(JNIEnv* env)
diff --git a/core/jni/android_os_Hardware.cpp b/core/jni/android_os_Hardware.cpp
index bc8af78..8007662 100644
--- a/core/jni/android_os_Hardware.cpp
+++ b/core/jni/android_os_Hardware.cpp
@@ -15,7 +15,6 @@
 */
 
 #include <hardware_legacy/flashlight.h>
-#include <hardware_legacy/led.h>
 #include <hardware_legacy/power.h>
 
 #include <nativehelper/jni.h>
@@ -24,12 +23,6 @@
 
 namespace android {
 
-static jboolean
-setLedState(JNIEnv *env, jobject clazz, jint colorARGB, jint onMS, jint offMS)
-{
-    return set_led_state(colorARGB, onMS, offMS);
-}
-
 static jint
 getFlashlightEnabled(JNIEnv *env, jobject clazz)
 {
@@ -48,24 +41,6 @@ enableCameraFlash(JNIEnv *env, jobject clazz, jint milliseconds)
     enable_camera_flash(milliseconds);
 }
 
-static void
-setScreenBacklight(JNIEnv *env, jobject clazz, jint brightness)
-{
-    set_light_brightness(SCREEN_LIGHT, brightness);
-}
-
-static void
-setKeyboardBacklight(JNIEnv *env, jobject clazz, jboolean on)
-{
-    set_light_brightness(KEYBOARD_LIGHT, (on ? 255 : 0));
-}
-
-static void
-setButtonBacklight(JNIEnv *env, jobject clazz, jboolean on)
-{
-    set_light_brightness(BUTTON_LIGHT, (on ? 255 : 0));
-}
-
 // ============================================================================
 /*
  * JNI registration.
@@ -73,13 +48,9 @@ setButtonBacklight(JNIEnv *env, jobject clazz, jboolean on)
 
 static JNINativeMethod g_methods[] = {
     /* name, signature, funcPtr */
-    { "setLedState",       "(III)I", (void*)setLedState },
     { "getFlashlightEnabled", "()Z", (void*)getFlashlightEnabled },
     { "setFlashlightEnabled", "(Z)V", (void*)setFlashlightEnabled },
     { "enableCameraFlash", "(I)V", (void*)enableCameraFlash },
-    { "setScreenBacklight", "(I)V", (void*)setScreenBacklight },
-    { "setKeyboardBacklight", "(Z)V", (void*)setKeyboardBacklight },
-    { "setButtonBacklight", "(Z)V", (void*)setButtonBacklight },
 };
 
 int register_android_os_Hardware(JNIEnv* env)
diff --git a/core/jni/android_os_Power.cpp b/core/jni/android_os_Power.cpp
index c2d75b1..df5edba 100644
--- a/core/jni/android_os_Power.cpp
+++ b/core/jni/android_os_Power.cpp
@@ -70,12 +70,6 @@ setLastUserActivityTimeout(JNIEnv *env, jobject clazz, jlong timeMS)
 }
 
 static int
-setLightBrightness(JNIEnv *env, jobject clazz, jint mask, jint brightness)
-{
-    return set_light_brightness(mask, brightness);
-}
-
-static int
 setScreenState(JNIEnv *env, jobject clazz, jboolean on)
 {
     return set_screen_state(on);
@@ -109,7 +103,6 @@ static JNINativeMethod method_table[] = {
     { "acquireWakeLock", "(ILjava/lang/String;)V", (void*)acquireWakeLock },
     { "releaseWakeLock", "(Ljava/lang/String;)V", (void*)releaseWakeLock },
     { "setLastUserActivityTimeout", "(J)I", (void*)setLastUserActivityTimeout },
-    { "setLightBrightness", "(II)I", (void*)setLightBrightness },
     { "setScreenState", "(Z)I", (void*)setScreenState },
     { "shutdown", "()V", (void*)android_os_Power_shutdown },
     { "reboot", "(Ljava/lang/String;)V", (void*)android_os_Power_reboot },