Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a72735cd authored by Andre Eisenbach's avatar Andre Eisenbach Committed by Gerrit Code Review
Browse files

Merge changes I38c8ec64,Iac544226 

* changes:
  Make sure wakelock is held before releaseing it
  Do not delete/re-create wakelock on acquisition/release
parents 7296f053 fae6b54e

jni/com_android_bluetooth_btservice_AdapterService.cpp

+20 −12
Original line number Diff line number Diff line
@@ -488,7 +488,7 @@ static void *sAlarmCallbackData; 


static JavaVMAttachArgs sAttachArgs = {

  .version = JNI_VERSION_1_6,

  .name = "bluedroid wake/alarm thread",

  .name = "bluetooth wake",

  .group = NULL

};
@@ -532,54 +532,62 @@ static int acquire_wake_lock_callout(const char *lock_name) { 
    jint status = vm->GetEnv((void **)&env, JNI_VERSION_1_6);

    if (status != JNI_OK && status != JNI_EDETACHED) {

        ALOGE("%s unable to get environment for JNI call", __func__);

        return BT_STATUS_FAIL;

        return BT_STATUS_JNI_ENVIRONMENT_ERROR;

    }

    if (status == JNI_EDETACHED && vm->AttachCurrentThread(&env, &sAttachArgs) != 0) {

        ALOGE("%s unable to attach thread to VM", __func__);

        return BT_STATUS_FAIL;

        return BT_STATUS_JNI_THREAD_ATTACH_ERROR;

    }



    jboolean ret = JNI_FALSE;

    jint ret = BT_STATUS_SUCCESS;

    jstring lock_name_jni = env->NewStringUTF(lock_name);

    if (lock_name_jni) {

        ret = env->CallBooleanMethod(sJniAdapterServiceObj, method_acquireWakeLock, lock_name_jni);

        bool acquired = env->CallBooleanMethod(sJniAdapterServiceObj,

                            method_acquireWakeLock, lock_name_jni);

        if (!acquired) ret = BT_STATUS_WAKELOCK_ERROR;

        env->DeleteLocalRef(lock_name_jni);

    } else {

        ALOGE("%s unable to allocate string: %s", __func__, lock_name);

        ret = BT_STATUS_NOMEM;

    }



    if (status == JNI_EDETACHED) {

        vm->DetachCurrentThread();

    }



    return ret ? BT_STATUS_SUCCESS : BT_STATUS_FAIL;

    return ret;

}



static int release_wake_lock_callout(const char *lock_name) {

    JNIEnv *env;

    JavaVM *vm = AndroidRuntime::getJavaVM();

    jint status = vm->GetEnv((void **)&env, JNI_VERSION_1_6);



    if (status != JNI_OK && status != JNI_EDETACHED) {

        ALOGE("%s unable to get environment for JNI call", __func__);

        return BT_STATUS_FAIL;

        return BT_STATUS_JNI_ENVIRONMENT_ERROR;

    }

    if (status == JNI_EDETACHED && vm->AttachCurrentThread(&env, &sAttachArgs) != 0) {

        ALOGE("%s unable to attach thread to VM", __func__);

        return BT_STATUS_FAIL;

        return BT_STATUS_JNI_THREAD_ATTACH_ERROR;

    }

    jboolean ret = JNI_FALSE;



    jint ret = BT_STATUS_SUCCESS;

    jstring lock_name_jni = env->NewStringUTF(lock_name);

    if (lock_name_jni) {

        ret = env->CallBooleanMethod(sJniAdapterServiceObj, method_releaseWakeLock, lock_name_jni);

        bool released = env->CallBooleanMethod(sJniAdapterServiceObj,

                            method_releaseWakeLock, lock_name_jni);

        if (!released) ret = BT_STATUS_WAKELOCK_ERROR;

        env->DeleteLocalRef(lock_name_jni);

    } else {

        ALOGE("%s unable to allocate string: %s", __func__, lock_name);

        ret = BT_STATUS_NOMEM;

    }



    if (status == JNI_EDETACHED) {

        vm->DetachCurrentThread();

    }

    return ret ? BT_STATUS_SUCCESS : BT_STATUS_FAIL;



    return ret;

}



// Called by Java code when alarm is fired. A wake lock is held by the caller

src/com/android/bluetooth/btservice/AdapterService.java

+10 −16
Original line number Diff line number Diff line
@@ -547,6 +547,7 @@ public class AdapterService extends Service { 
        // {@link #releaseWakeLock(String lockName)}, so a synchronization is needed here.

        synchronized (this) {

            if (mWakeLock != null) {

                if (mWakeLock.isHeld())

                    mWakeLock.release();

                mWakeLock = null;

            }
@@ -2020,21 +2021,15 @@ public class AdapterService extends Service { 
    // extended to allow acquiring an arbitrary number of wake locks. The current interface

    // takes |lockName| as a parameter in anticipation of that implementation.

    private boolean acquireWakeLock(String lockName) {

        if (mWakeLock != null) {

            if (!lockName.equals(mWakeLockName)) {

                errorLog("Multiple wake lock acquisition attempted; aborting: " + lockName);

                return false;

            }



            // We're already holding the desired wake lock so return success.

            if (mWakeLock.isHeld()) {

                return true;

            }

        }



        synchronized (this) {

            if (mWakeLock == null) {

                mWakeLockName = lockName;

                mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, lockName);

            }



            if (!mWakeLock.isHeld())

                mWakeLock.acquire();

        }

        return true;

    }
@@ -2049,9 +2044,8 @@ public class AdapterService extends Service { 
                return false;

            }



            if (mWakeLock.isHeld())

                mWakeLock.release();

            mWakeLock = null;

            mWakeLockName = null;

        }

        return true;

    }