Make sure wakelock is held before releaseing it (e94f8eb8) · Commits · e / os / android_packages_apps_Bluetooth

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

+12 −9

Original line number	Diff line number	Diff line
		@@ -659,6 +659,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;
		}
		@@ -2194,6 +2195,7 @@ 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) {
		synchronized (this) {
		if (mWakeLock == null) {
		mWakeLockName = lockName;
		mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, lockName);
		@@ -2201,7 +2203,7 @@ public class AdapterService extends Service {

		if (!mWakeLock.isHeld())
		mWakeLock.acquire();

		}
		return true;
		}

		@@ -2216,6 +2218,7 @@ public class AdapterService extends Service {
		return false;
		}

		if (mWakeLock.isHeld())
		mWakeLock.release();
		}
		return true;