Jon West | eb45d5e | 2019-03-17 16:58:43 -0400 | [diff] [blame^] | 1 | From 1d2e505a0ef6c9fa413722133392f62c194e1831 Mon Sep 17 00:00:00 2001 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Thu, 17 May 2018 20:28:35 +0200 |
Jon West | eb45d5e | 2019-03-17 16:58:43 -0400 | [diff] [blame^] | 4 | Subject: [PATCH 04/27] Don't crash if there is IR HAL is not declared |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 5 | |
| 6 | --- |
| 7 | services/core/java/com/android/server/ConsumerIrService.java | 2 -- |
| 8 | 1 file changed, 2 deletions(-) |
| 9 | |
| 10 | diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java |
Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame] | 11 | index 839629c6f82..0a0065a7b55 100644 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 12 | --- a/services/core/java/com/android/server/ConsumerIrService.java |
| 13 | +++ b/services/core/java/com/android/server/ConsumerIrService.java |
Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame] | 14 | @@ -52,8 +52,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub { |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 15 | 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 | } |
Jackeagle | a3ae16b | 2018-12-04 11:30:49 -0500 | [diff] [blame] | 21 | mParameter = AudioSystem.getParameters("audio_capability#irda_support"); |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 22 | } |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 23 | -- |
Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 24 | 2.17.1 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 25 | |