GSI updates for frameworks/base
Change-Id: I98fb95c5be8b75c9dcfef19a6fd8890215996891
diff --git a/patches/frameworks/base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch b/patches/frameworks/base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
new file mode 100644
index 0000000..6beb6e0
--- /dev/null
+++ b/patches/frameworks/base/0020-Don-t-wake-IR-HAL-to-the-infinity-and-beyond.patch
@@ -0,0 +1,46 @@
+From 7c6f3ad50399d8c57c02f8882e2df5c68b903a92 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 20/27] 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.17.1
+