commit fb7accfc836c40a08dc703a6da41fd07e4172538
author Andreas Huber <andih@google.com> Mon Oct 24 12:36:23 2016 -0700
committer Andreas Huber <andih@google.com> Tue Oct 25 09:43:38 2016 -0700
tree 338f4ef4ea4a7febc64a949b23de97bbb788626c
parent 817695589c80cfc0913d94e3dd52dac2782e8ed6

Import android.hardware.thermal@1.0 constants into HardwarePropertiesManager.

Bug: 32200867
Test: make
Change-Id: I4e63e7c5431b33011b7c334077a5bd0c7edcf3a2

Android.mk

diff --git a/Android.mk b/Android.mk
index 5fef91e..9844a15 100644
--- a/Android.mk
+++ b/Android.mk
@@ -503,7 +503,10 @@
 
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext
-LOCAL_STATIC_JAVA_LIBRARIES := framework-protos
+
+LOCAL_STATIC_JAVA_LIBRARIES :=                          \
+    framework-protos                                    \
+    android.hardware.thermal@1.0-java-constants         \
 
 LOCAL_MODULE := framework
 

core/java/android/os/HardwarePropertiesManager.java

diff --git a/core/java/android/os/HardwarePropertiesManager.java b/core/java/android/os/HardwarePropertiesManager.java
index 9d362d6..6dec0dc 100644
--- a/core/java/android/os/HardwarePropertiesManager.java
+++ b/core/java/android/os/HardwarePropertiesManager.java
@@ -18,6 +18,7 @@
 import android.annotation.IntDef;
 import android.annotation.NonNull;
 import android.content.Context;
+import android.hardware.thermal.V1_0.Constants;
 import android.util.Log;
 
 import java.lang.annotation.Retention;
@@ -56,18 +57,19 @@
     /**
      * Device temperature types. These must match the values in
      * frameworks/native/include/hardwareproperties/HardwarePropertiesManager.h
+     * TODO(b/32022261) Remove this comment.
      */
     /** Temperature of CPUs in Celsius. */
-    public static final int DEVICE_TEMPERATURE_CPU = 0;
+    public static final int DEVICE_TEMPERATURE_CPU = Constants.TemperatureType.CPU;
 
     /** Temperature of GPUs in Celsius. */
-    public static final int DEVICE_TEMPERATURE_GPU = 1;
+    public static final int DEVICE_TEMPERATURE_GPU = Constants.TemperatureType.GPU;
 
     /** Temperature of battery in Celsius. */
-    public static final int DEVICE_TEMPERATURE_BATTERY = 2;
+    public static final int DEVICE_TEMPERATURE_BATTERY = Constants.TemperatureType.BATTERY;
 
     /** Temperature of device skin in Celsius. */
-    public static final int DEVICE_TEMPERATURE_SKIN = 3;
+    public static final int DEVICE_TEMPERATURE_SKIN = Constants.TemperatureType.SKIN;
 
     /** Get current temperature. */
     public static final int TEMPERATURE_CURRENT = 0;