aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-03-11 02:14:50 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-03-11 02:14:50 +0000
commitf1ffc7e8a4688ad0af0302de1f3f6e7c94baff78 (patch)
tree7cc3c2c43138fb9d39efa703bdefea69a4e5aa11
parentb2406ef60cdef5eb7246a4080877484e1b33e8bd (diff)
parent276c0bf1407d7db7fe63c7373307cb6b4440c95b (diff)
downloadplatform_external_robolectric-shadows-f1ffc7e8a4688ad0af0302de1f3f6e7c94baff78.tar.gz
platform_external_robolectric-shadows-f1ffc7e8a4688ad0af0302de1f3f6e7c94baff78.tar.bz2
platform_external_robolectric-shadows-f1ffc7e8a4688ad0af0302de1f3f6e7c94baff78.zip
Snap for 6282804 from 276c0bf1407d7db7fe63c7373307cb6b4440c95b to rvc-release
Change-Id: I787e8591e8e1e492bdaaab514ecc0e23a5e61b5a
-rw-r--r--shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
index 1916e34cc..41b3f9cb0 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowServiceManager.java
@@ -47,6 +47,7 @@ import android.os.IBatteryPropertiesRegistrar;
import android.os.IBinder;
import android.os.IInterface;
import android.os.IPowerManager;
+import android.os.IThermalService;
import android.os.IUserManager;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -204,6 +205,8 @@ public class ShadowServiceManager {
if (RuntimeEnvironment.getApiLevel() >= R) {
map.put(Context.TETHERING_SERVICE,
createBinder(ITetheringConnector.class, "android.net.ITetheringConnector"));
+ map.put(Context.THERMAL_SERVICE,
+ createBinder(IThermalService.class, "android.os.IThermalService"));
}
// END-INTERNAL
SERVICES = Collections.unmodifiableMap(map);