Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.3.9.00009.1'

Change-Id: Idfe72c7a7b7b225a4f70b376f4e0c3f77146c05d

2 files changed, 44 insertions, 1 deletions

diff --git a/Android.mk b/Android.mk
index 34151d6..5b2add9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,14 +19,21 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := thermal.$(TARGET_BOARD_PLATFORM)
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_PROPRIETARY_MODULE := true
-LOCAL_SRC_FILES := thermal.c
 
 ifeq ($(call is-board-platform-in-list,msm8998), true)
+LOCAL_SRC_FILES := thermal.c
 LOCAL_SRC_FILES += thermal-8998.c
+SUPPORT_THERMAL_HAL:=1
 endif
 
 ifeq ($(call is-board-platform-in-list,sdm845), true)
+LOCAL_SRC_FILES := thermal.c
 LOCAL_SRC_FILES += thermal-845.c
+SUPPORT_THERMAL_HAL:=1
+endif
+
+ifeq ($(SUPPORT_THERMAL_HAL),)
+LOCAL_SRC_FILES := thermal-default.c
 endif
 
 LOCAL_SHARED_LIBRARIES := liblog libcutils
diff --git a/thermal-default.c b/thermal-default.c
new file mode 100644
index 0000000..d5202a7
--- /dev/null
+++ b/thermal-default.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ * Not a contribution
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <hardware/hardware.h>
+#include <hardware/thermal.h>
+
+static struct hw_module_methods_t thermal_module_methods = {
+    .open = NULL,
+};
+
+thermal_module_t HAL_MODULE_INFO_SYM = {
+    .common = {
+        .tag = HARDWARE_MODULE_TAG,
+        .module_api_version = THERMAL_HARDWARE_MODULE_API_VERSION_0_1,
+        .hal_api_version = HARDWARE_HAL_API_VERSION,
+        .id = THERMAL_HARDWARE_MODULE_ID,
+        .name = "Default Thermal HAL",
+        .author = "The Android Open Source Project",
+        .methods = &thermal_module_methods,
+    },
+};