aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2020-02-28 02:08:04 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2020-02-28 02:08:04 +0000
commitef6577c011f3ea64a45a60fc51a33955be19ec8b (patch)
tree4ee73280935c77d5b6f6ed740e259c0299e58b72
parent49f073c8eb40a651f7c920ee8aed5898438ab84c (diff)
parent53afadd55110b6083c25a3c9110cd2bf2eb6294e (diff)
downloadplatform_external_robolectric-shadows-android10-d4-release.tar.gz
platform_external_robolectric-shadows-android10-d4-release.tar.bz2
platform_external_robolectric-shadows-android10-d4-release.zip
Snap for 6245392 from 53afadd55110b6083c25a3c9110cd2bf2eb6294e to qt-d4-releaseandroid-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android10-d4-s1-releaseandroid10-d4-release
Change-Id: I4fd0d1f1a83e14c056cc7bdf26b3d8ec52f66f60
-rw-r--r--shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
index 65dbc15ff..d2167da83 100644
--- a/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
+++ b/shadows/framework/src/main/java/org/robolectric/shadows/ShadowActivityThread.java
@@ -7,6 +7,7 @@ import android.os.RemoteException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.util.Collections;
import javax.annotation.Nonnull;
import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Implementation;
@@ -51,6 +52,8 @@ public class ShadowActivityThread {
return null;
} else if (method.getName().equals("getPackageInstaller")) {
return null;
+ } else if (method.getName().equals("getSplitPermissions")) {
+ return Collections.emptyList();
}
throw new UnsupportedOperationException("sorry, not supporting " + method + " yet!");
}