am cfa254fe: am 1ae7831b: am 8b1243e5: jni: GpsLocationProvider: Check for pending callbacks before waiting

Merge commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9'

* commit 'cfa254fe102230915abdd42dac1a5b18ab4ac1a9':
  jni: GpsLocationProvider: Check for pending callbacks before waiting
This commit is contained in:
Jared Suttles
2009-11-06 10:28:34 -08:00
committed by Android Git Automerger

View File

@@ -266,7 +266,9 @@ static void android_location_GpsLocationProvider_delete_aiding_data(JNIEnv* env,
static void android_location_GpsLocationProvider_wait_for_event(JNIEnv* env, jobject obj)
{
pthread_mutex_lock(&sEventMutex);
pthread_cond_wait(&sEventCond, &sEventMutex);
while (sPendingCallbacks == 0) {
pthread_cond_wait(&sEventCond, &sEventMutex);
}
// copy and clear the callback flags
int pendingCallbacks = sPendingCallbacks;