summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorVictoria Lease <violets@android.com>2013-01-02 14:46:48 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-02 14:46:48 -0800
commit380b45b805c07a9df3135bc009dcde7b0b96b73f (patch)
tree99dd18827b6f82e524e477b210a4385f110f94de /services
parentff0cb3737b2f4f2e0762468f8424bba8a5681faf (diff)
parent73e243c4d271907d10f10b301b2d6854e1f63fe4 (diff)
downloadframeworks_base-380b45b805c07a9df3135bc009dcde7b0b96b73f.zip
frameworks_base-380b45b805c07a9df3135bc009dcde7b0b96b73f.tar.gz
frameworks_base-380b45b805c07a9df3135bc009dcde7b0b96b73f.tar.bz2
am 73e243c4: Merge "Fix logging typos in GpsLocationProvider"
* commit '73e243c4d271907d10f10b301b2d6854e1f63fe4': Fix logging typos in GpsLocationProvider
Diffstat (limited to 'services')
-rw-r--r--services/jni/com_android_server_location_GpsLocationProvider.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/jni/com_android_server_location_GpsLocationProvider.cpp b/services/jni/com_android_server_location_GpsLocationProvider.cpp
index 50bd46e..036fc43 100644
--- a/services/jni/com_android_server_location_GpsLocationProvider.cpp
+++ b/services/jni/com_android_server_location_GpsLocationProvider.cpp
@@ -490,7 +490,7 @@ static void android_location_GpsLocationProvider_agps_data_conn_open(JNIEnv* env
static void android_location_GpsLocationProvider_agps_data_conn_closed(JNIEnv* env, jobject obj)
{
if (!sAGpsInterface) {
- ALOGE("no AGPS interface in agps_data_conn_open");
+ ALOGE("no AGPS interface in agps_data_conn_closed");
return;
}
sAGpsInterface->data_conn_closed();
@@ -499,7 +499,7 @@ static void android_location_GpsLocationProvider_agps_data_conn_closed(JNIEnv* e
static void android_location_GpsLocationProvider_agps_data_conn_failed(JNIEnv* env, jobject obj)
{
if (!sAGpsInterface) {
- ALOGE("no AGPS interface in agps_data_conn_open");
+ ALOGE("no AGPS interface in agps_data_conn_failed");
return;
}
sAGpsInterface->data_conn_failed();
@@ -509,7 +509,7 @@ static void android_location_GpsLocationProvider_set_agps_server(JNIEnv* env, jo
jint type, jstring hostname, jint port)
{
if (!sAGpsInterface) {
- ALOGE("no AGPS interface in agps_data_conn_open");
+ ALOGE("no AGPS interface in set_agps_server");
return;
}
const char *c_hostname = env->GetStringUTFChars(hostname, NULL);