patches/frameworks/base/0018-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch

From 96d882452fbeb23540987f04dd41721c1ba0e89b Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Tue, 21 Aug 2018 22:24:02 +0200
Subject: [PATCH 18/28] Don't wake IR HAL to the infinity and beyond

Conflicts:
	services/core/java/com/android/server/ConsumerIrService.java

Change-Id: Ie0e152f11246baed6f3571a1c9d8b901d5a3dc02
---
 services/core/java/com/android/server/ConsumerIrService.java | 5 -----
 services/core/jni/com_android_server_ConsumerIrService.cpp   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java
index 0a0065a7b55..ead288ea01a 100644
--- a/services/core/java/com/android/server/ConsumerIrService.java
+++ b/services/core/java/com/android/server/ConsumerIrService.java
@@ -48,11 +48,6 @@ public class ConsumerIrService extends IConsumerIrService.Stub {
         mWakeLock.setReferenceCounted(true);
 
         mHasNativeHal = halOpen();
-        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CONSUMER_IR)) {
-            if (!mHasNativeHal) {
-                throw new RuntimeException("FEATURE_CONSUMER_IR present, but no IR HAL loaded!");
-            }
-        }
         mParameter = AudioSystem.getParameters("audio_capability#irda_support");
     }
 
diff --git a/services/core/jni/com_android_server_ConsumerIrService.cpp b/services/core/jni/com_android_server_ConsumerIrService.cpp
index 2ca348b3ae4..148fba9a688 100644
--- a/services/core/jni/com_android_server_ConsumerIrService.cpp
+++ b/services/core/jni/com_android_server_ConsumerIrService.cpp
@@ -36,7 +36,7 @@ static sp<IConsumerIr> mHal;
 
 static jboolean halOpen(JNIEnv* /* env */, jobject /* obj */) {
     // TODO(b/31632518)
-    mHal = IConsumerIr::getService();
+    mHal = IConsumerIr::tryGetService();
     return mHal != nullptr;
 }
 
-- 
2.21.0