diff --git a/api/cm_current.txt b/api/cm_current.txt
index daf5fea..2e3217d 100644
--- a/api/cm_current.txt
+++ b/api/cm_current.txt
@@ -373,6 +373,7 @@ package cyanogenmod.hardware {
     method public deprecated int getNumGammaControls();
     method public java.lang.String getSerialNumber();
     method public int getSupportedFeatures();
+    method public int getThermalState();
     method public int getVibratorDefaultIntensity();
     method public int getVibratorIntensity();
     method public int getVibratorMaxIntensity();
@@ -382,12 +383,14 @@ package cyanogenmod.hardware {
     method public byte[] readPersistentBytes(java.lang.String);
     method public int readPersistentInt(java.lang.String);
     method public java.lang.String readPersistentString(java.lang.String);
+    method public boolean registerThermalListener(cyanogenmod.hardware.ThermalListenerCallback);
     method public boolean requireAdaptiveBacklightForSunlightEnhancement();
     method public boolean set(int, boolean);
     method public boolean setDisplayColorCalibration(int[]);
     method public deprecated boolean setDisplayGammaCalibration(int, int[]);
     method public boolean setDisplayMode(cyanogenmod.hardware.DisplayMode, boolean);
     method public boolean setVibratorIntensity(int);
+    method public boolean unRegisterThermalListener(cyanogenmod.hardware.ThermalListenerCallback);
     method public boolean writePersistentBytes(java.lang.String, byte[]);
     method public boolean writePersistentInt(java.lang.String, int);
     method public boolean writePersistentString(java.lang.String, java.lang.String);
@@ -404,6 +407,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_SERIAL_NUMBER = 128; // 0x80
     field public static final int FEATURE_SUNLIGHT_ENHANCEMENT = 256; // 0x100
     field public static final int FEATURE_TAP_TO_WAKE = 512; // 0x200
+    field public static final int FEATURE_THERMAL_MONITOR = 32768; // 0x8000
     field public static final int FEATURE_TOUCH_HOVERING = 2048; // 0x800
     field public static final int FEATURE_VIBRATOR = 1024; // 0x400
   }
@@ -416,6 +420,31 @@ package cyanogenmod.hardware {
     field public final java.lang.String name;
   }
 
+  public abstract interface IThermalListenerCallback implements android.os.IInterface {
+    method public abstract void onThermalChanged(int) throws android.os.RemoteException;
+  }
+
+  public static abstract class IThermalListenerCallback.Stub extends android.os.Binder implements cyanogenmod.hardware.IThermalListenerCallback {
+    ctor public IThermalListenerCallback.Stub();
+    method public android.os.IBinder asBinder();
+    method public static cyanogenmod.hardware.IThermalListenerCallback asInterface(android.os.IBinder);
+    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+  }
+
+  public abstract class ThermalListenerCallback extends cyanogenmod.hardware.IThermalListenerCallback.Stub {
+    ctor public ThermalListenerCallback();
+  }
+
+  public static final class ThermalListenerCallback.State {
+    ctor public ThermalListenerCallback.State();
+    method public static final java.lang.String toString(int);
+    field public static final int STATE_COOL = 0; // 0x0
+    field public static final int STATE_EXTREME = 3; // 0x3
+    field public static final int STATE_HIGH = 2; // 0x2
+    field public static final int STATE_NORMAL = 1; // 0x1
+    field public static final int STATE_UNKNOWN = -1; // 0xffffffff
+  }
+
 }
 
 package cyanogenmod.media {
diff --git a/system-api/cm_system-current.txt b/system-api/cm_system-current.txt
index daf5fea..2e3217d 100644
--- a/system-api/cm_system-current.txt
+++ b/system-api/cm_system-current.txt
@@ -373,6 +373,7 @@ package cyanogenmod.hardware {
     method public deprecated int getNumGammaControls();
     method public java.lang.String getSerialNumber();
     method public int getSupportedFeatures();
+    method public int getThermalState();
     method public int getVibratorDefaultIntensity();
     method public int getVibratorIntensity();
     method public int getVibratorMaxIntensity();
@@ -382,12 +383,14 @@ package cyanogenmod.hardware {
     method public byte[] readPersistentBytes(java.lang.String);
     method public int readPersistentInt(java.lang.String);
     method public java.lang.String readPersistentString(java.lang.String);
+    method public boolean registerThermalListener(cyanogenmod.hardware.ThermalListenerCallback);
     method public boolean requireAdaptiveBacklightForSunlightEnhancement();
     method public boolean set(int, boolean);
     method public boolean setDisplayColorCalibration(int[]);
     method public deprecated boolean setDisplayGammaCalibration(int, int[]);
     method public boolean setDisplayMode(cyanogenmod.hardware.DisplayMode, boolean);
     method public boolean setVibratorIntensity(int);
+    method public boolean unRegisterThermalListener(cyanogenmod.hardware.ThermalListenerCallback);
     method public boolean writePersistentBytes(java.lang.String, byte[]);
     method public boolean writePersistentInt(java.lang.String, int);
     method public boolean writePersistentString(java.lang.String, java.lang.String);
@@ -404,6 +407,7 @@ package cyanogenmod.hardware {
     field public static final int FEATURE_SERIAL_NUMBER = 128; // 0x80
     field public static final int FEATURE_SUNLIGHT_ENHANCEMENT = 256; // 0x100
     field public static final int FEATURE_TAP_TO_WAKE = 512; // 0x200
+    field public static final int FEATURE_THERMAL_MONITOR = 32768; // 0x8000
     field public static final int FEATURE_TOUCH_HOVERING = 2048; // 0x800
     field public static final int FEATURE_VIBRATOR = 1024; // 0x400
   }
@@ -416,6 +420,31 @@ package cyanogenmod.hardware {
     field public final java.lang.String name;
   }
 
+  public abstract interface IThermalListenerCallback implements android.os.IInterface {
+    method public abstract void onThermalChanged(int) throws android.os.RemoteException;
+  }
+
+  public static abstract class IThermalListenerCallback.Stub extends android.os.Binder implements cyanogenmod.hardware.IThermalListenerCallback {
+    ctor public IThermalListenerCallback.Stub();
+    method public android.os.IBinder asBinder();
+    method public static cyanogenmod.hardware.IThermalListenerCallback asInterface(android.os.IBinder);
+    method public boolean onTransact(int, android.os.Parcel, android.os.Parcel, int) throws android.os.RemoteException;
+  }
+
+  public abstract class ThermalListenerCallback extends cyanogenmod.hardware.IThermalListenerCallback.Stub {
+    ctor public ThermalListenerCallback();
+  }
+
+  public static final class ThermalListenerCallback.State {
+    ctor public ThermalListenerCallback.State();
+    method public static final java.lang.String toString(int);
+    field public static final int STATE_COOL = 0; // 0x0
+    field public static final int STATE_EXTREME = 3; // 0x3
+    field public static final int STATE_HIGH = 2; // 0x2
+    field public static final int STATE_NORMAL = 1; // 0x1
+    field public static final int STATE_UNKNOWN = -1; // 0xffffffff
+  }
+
 }
 
 package cyanogenmod.media {