| Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 1 | From 5d5a6a281c69f7eb8b78ddd7a4b7b120fe3d56df 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 |
| Jackeagle | 0cc335a | 2018-10-19 00:06:49 -0400 | [diff] [blame] | 4 | Subject: [PATCH 06/26] 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 | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 11 | index 2ed6c77baa0..c574a03c9a3 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 |
| 14 | @@ -50,8 +50,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub { |
| 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 | } |
| 21 | } |
| 22 | |
| 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 | |