From d7a6847541ff67793487d581067ca724b3144c60 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Tue, 21 Aug 2018 22:24:02 +0200 Subject: [PATCH] Don't wake IR HAL to the infinity and beyond --- .../core/java/com/android/server/ConsumerIrService.java | 7 ------- services/core/jni/com_android_server_ConsumerIrService.cpp | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/services/core/java/com/android/server/ConsumerIrService.java b/services/core/java/com/android/server/ConsumerIrService.java index 2ed6c77baa0..82ec033bc30 100644 --- a/services/core/java/com/android/server/ConsumerIrService.java +++ b/services/core/java/com/android/server/ConsumerIrService.java @@ -46,13 +46,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!"); - } - } else if (mHasNativeHal) { - throw new RuntimeException("IR HAL present, but FEATURE_CONSUMER_IR is not set!"); - } } @Override 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 mHal; static jboolean halOpen(JNIEnv* /* env */, jobject /* obj */) { // TODO(b/31632518) - mHal = IConsumerIr::getService(); + mHal = IConsumerIr::tryGetService(); return mHal != nullptr; } -- 2.17.1