Merge "Use the Telecom lock in Telecom.Runnable" into nyc-mr1-dev (d532ef0f) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/BluetoothManager.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -121,7 +121,7 @@ public class BluetoothManager {

		private BluetoothHeadsetProxy mBluetoothHeadset;
		private long mBluetoothConnectionRequestTime;
		private final Runnable mBluetoothConnectionTimeout = new Runnable("BM.cBA") {
		private final Runnable mBluetoothConnectionTimeout = new Runnable("BM.cBA", null /lock/) {
		@Override
		public void loggedRun() {
		if (!isBluetoothAudioConnected()) {
		@@ -132,7 +132,7 @@ public class BluetoothManager {
		}
		};

		private final Runnable mRetryConnectAudio = new Runnable("BM.rCA") {
		private final Runnable mRetryConnectAudio = new Runnable("BM.rCA", null /lock/) {
		@Override
		public void loggedRun() {
		Log.i(this, "Retrying connecting to bluetooth audio.");

+2 −2

Original line number	Diff line number	Diff line
		@@ -110,7 +110,7 @@ public class CallerInfoLookupHelper {
		}
		}

		mHandler.post(new Runnable("CILH.sL") {
		mHandler.post(new Runnable("CILH.sL", mLock) {
		@Override
		public void loggedRun() {
		Session continuedSession = Log.createSubsession();
		@@ -160,7 +160,7 @@ public class CallerInfoLookupHelper {
		}

		private void startPhotoLookup(final Uri handle, final Uri contactPhotoUri) {
		mHandler.post(new Runnable("CILH.sPL") {
		mHandler.post(new Runnable("CILH.sPL", mLock) {
		@Override
		public void loggedRun() {
		Session continuedSession = Log.createSubsession();

+8 −13

Original line number	Diff line number	Diff line
		@@ -445,16 +445,13 @@ public class CallsManager extends Call.ListenerBase

		mDtmfLocalTonePlayer.playTone(call, nextChar);

		// TODO: Create a LockedRunnable class that does the synchronization automatically.
		mStopTone = new Runnable("CM.oPDC") {
		mStopTone = new Runnable("CM.oPDC", mLock) {
		@Override
		public void loggedRun() {
		synchronized (mLock) {
		// Set a timeout to stop the tone in case there isn't another tone to
		// follow.
		mDtmfLocalTonePlayer.stopTone(call);
		}
		}
		};
		mHandler.postDelayed(mStopTone.prepare(),
		Timeouts.getDelayBetweenDtmfTonesMillis(mContext.getContentResolver()));
		@@ -507,16 +504,14 @@ public class CallsManager extends Call.ListenerBase
		@Override
		public boolean onCanceledViaNewOutgoingCallBroadcast(final Call call) {
		mPendingCallsToDisconnect.add(call);
		mHandler.postDelayed(new Runnable("CM.oCVNOCB") {
		mHandler.postDelayed(new Runnable("CM.oCVNOCB", mLock) {
		@Override
		public void loggedRun() {
		synchronized (mLock) {
		if (mPendingCallsToDisconnect.remove(call)) {
		Log.i(this, "Delayed disconnection of call: %s", call);
		call.disconnect();
		}
		}
		}
		}.prepare(), Timeouts.getNewOutgoingCallCancelMillis(mContext.getContentResolver()));

		return true;

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ final class CreateConnectionTimeout extends Runnable {

		CreateConnectionTimeout(Context context, PhoneAccountRegistrar phoneAccountRegistrar,
		ConnectionServiceWrapper service, Call call) {
		super("CCT");
		super("CCT", null /lock/);
		mContext = context;
		mPhoneAccountRegistrar = phoneAccountRegistrar;
		mConnectionService = service;

+4 −6

Original line number	Diff line number	Diff line
		@@ -663,16 +663,14 @@ public final class InCallController extends CallsManagerListenerBase {
		* give them enough time to process all the pending messages.
		*/
		Handler handler = new Handler(Looper.getMainLooper());
		handler.postDelayed(new Runnable("ICC.oCR") {
		handler.postDelayed(new Runnable("ICC.oCR", mLock) {
		@Override
		public void loggedRun() {
		synchronized (mLock) {
		// Check again to make sure there are no active calls.
		if (mCallsManager.getCalls().isEmpty()) {
		unbindFromServices();
		}
		}
		}
		}.prepare(), mTimeoutsAdapter.getCallRemoveUnbindInCallServicesDelay(
		mContext.getContentResolver()));
		}