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

Commit 70aeddac authored by Zhihai Xu's avatar Zhihai Xu Committed by Android Git Automerger
Browse files

am 54d2a1f6: am 69bb2e8b: Merge "remove a read lock to work around a platform...

am 54d2a1f6: am 69bb2e8b: Merge "remove a read lock to work around a platform deadlock problem." into klp-dev

* commit '54d2a1f6':
  remove a read lock to work around a platform deadlock problem.
parents bef5019a 54d2a1f6
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -203,11 +203,10 @@ class AdapterProperties {
     * @return the mState
     */
    int getState() {
        synchronized (mObject) {
            if (VDBG) debugLog("State = " + mState);
        /* remove the lock to work around a platform deadlock problem */
        /* and also for read access, it is safe to remove the lock to save CPU power */
        return mState;
    }
    }

    /**
     * @return the mBondedDevices