blob: c53d7cca97443be9ba12ac516021f574f5d4885d [file] [log] [blame]
Jon Westeb45d5e2019-03-17 16:58:43 -04001From 1d2e505a0ef6c9fa413722133392f62c194e1831 Mon Sep 17 00:00:00 2001
Jon West013ef582018-08-21 20:45:26 -04002From: Pierre-Hugues Husson <phh@phh.me>
3Date: Thu, 17 May 2018 20:28:35 +0200
Jon Westeb45d5e2019-03-17 16:58:43 -04004Subject: [PATCH 04/27] Don't crash if there is IR HAL is not declared
Jon West013ef582018-08-21 20:45:26 -04005
6---
7 services/core/java/com/android/server/ConsumerIrService.java | 2 --
8 1 file changed, 2 deletions(-)
9
10diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java
Jackeaglea3ae16b2018-12-04 11:30:49 -050011index 839629c6f82..0a0065a7b55 100644
Jon West013ef582018-08-21 20:45:26 -040012--- a/services/core/java/com/android/server/ConsumerIrService.java
13+++ b/services/core/java/com/android/server/ConsumerIrService.java
Jackeaglea3ae16b2018-12-04 11:30:49 -050014@@ -52,8 +52,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub {
Jon West013ef582018-08-21 20:45:26 -040015 if (!mHasNativeHal) {
16 throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!");
17 }
18- } else if (mHasNativeHal) {
19- throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!");
20 }
Jackeaglea3ae16b2018-12-04 11:30:49 -050021 mParameter = AudioSystem.getParameters("audio_capability#irda_support");
Jon West013ef582018-08-21 20:45:26 -040022 }
Jon West013ef582018-08-21 20:45:26 -040023--
Jackeagled3ba2282018-11-17 20:49:22 -0700242.17.1
Jon West013ef582018-08-21 20:45:26 -040025