Snap for 6245392 from 53afadd55110b6083c25a3c9110cd2bf2eb6294e to qt-d4-release
Change-Id: I4fd0d1f1a83e14c056cc7bdf26b3d8ec52f66f60
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 65dbc15..d2167da 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 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 @@
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!");
}
