Merge "speech: Fix RemoteSpeechReco race condition" into sc-dev am: ede93e7710 am: f73725e348 (bd16d095) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/speech/RemoteSpeechRecognitionService.java

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -125,10 +125,12 @@ final class RemoteSpeechRecognitionService extends ServiceConnector.Impl<IRecogn
	}		}
	});		});

			// Eager local evaluation to avoid reading a different or null value at closure-run-time
			final DelegatingListener listenerToStart = this.mDelegatingListener;
	run(service ->		run(service ->
	service.startListening(		service.startListening(
	recognizerIntent,		recognizerIntent,
	mDelegatingListener,		listenerToStart,
	attributionSource));		attributionSource));
	}		}
	}		}
	@@ -162,7 +164,9 @@ final class RemoteSpeechRecognitionService extends ServiceConnector.Impl<IRecogn
	}		}
	mRecordingInProgress = false;		mRecordingInProgress = false;

	run(service -> service.stopListening(mDelegatingListener));		// Eager local evaluation to avoid reading a different or null value at closure-run-time
			final DelegatingListener listenerToStop = this.mDelegatingListener;
			run(service -> service.stopListening(listenerToStop));
	}		}
	}		}