Merge "Catch STHAL factory exceptions" into udc-dev (4d1298ee) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/soundtrigger_middleware/SoundTriggerModule.java

+12 −3

Original line number	Original line	Diff line number	Diff line
	@@ -168,9 +168,18 @@ class SoundTriggerModule implements IBinder.DeathRecipient, ISoundTriggerHal.Glo
	* Attached to the HAL service via factory.		* Attached to the HAL service via factory.
	*/		*/
	private void attachToHal() {		private void attachToHal() {
			mHalService = null;
			while (mHalService == null) {
			try {
	mHalService = new SoundTriggerHalEnforcer(		mHalService = new SoundTriggerHalEnforcer(
	new SoundTriggerHalWatchdog(		new SoundTriggerHalWatchdog(
	new SoundTriggerDuplicateModelHandler(mHalFactory.create())));		new SoundTriggerDuplicateModelHandler(mHalFactory.create())));
			} catch (RuntimeException e) {
			if (!(e.getCause() instanceof RemoteException)) {
			throw e;
			}
			}
			}
	mHalService.linkToDeath(this);		mHalService.linkToDeath(this);
	mHalService.registerCallback(this);		mHalService.registerCallback(this);
	mProperties = mHalService.getProperties();		mProperties = mHalService.getProperties();