Merge "HeadsetPhoneState: Synchronize startListenForPhoneState to prevent race condition" (ffdcb1c0) · Commits · e / os / android_packages_modules_Bluetooth

android/app/src/com/android/bluetooth/hfp/HeadsetPhoneState.java

+33 −28

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ public class HeadsetPhoneState {
		private PhoneStateListener mPhoneStateListener;
		private final OnSubscriptionsChangedListener mOnSubscriptionsChangedListener;
		private SignalStrengthUpdateRequest mSignalStrengthUpdateRequest;
		private final Object mPhoneStateListenerLock = new Object();

		HeadsetPhoneState(HeadsetService headsetService) {
		Objects.requireNonNull(headsetService, "headsetService is null");
		@@ -145,6 +146,7 @@ public class HeadsetPhoneState {
		}

		private void startListenForPhoneState() {
		synchronized (mPhoneStateListenerLock) {
		if (mPhoneStateListener != null) {
		Log.w(TAG, "startListenForPhoneState, already listening");
		return;
		@@ -167,8 +169,10 @@ public class HeadsetPhoneState {
		mTelephonyManager.setSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest);
		}
		}
		}

		private void stopListenForPhoneState() {
		synchronized (mPhoneStateListenerLock) {
		if (mPhoneStateListener == null) {
		Log.i(TAG, "stopListenForPhoneState(), no listener indicates nothing is listening");
		return;
		@@ -179,6 +183,7 @@ public class HeadsetPhoneState {
		mPhoneStateListener = null;
		mTelephonyManager.clearSignalStrengthUpdateRequest(mSignalStrengthUpdateRequest);
		}
		}

		int getCindService() {
		return mCindService;