Fix JSR-166 tests.
- Remove calls to setSecurityManager, which throws unconditionally
on android.
- Remove an unsupported AccessController check.
- Remove an assertion that the default uncaught exception handler is
null. Regular android processes always have one installed.
bug: 20628776
(cherry picked from commit 151f344e88956741c0b8e4018df845d85d4eef25)
Change-Id: Ida7499c74586d007b8381522bec45f9a0c8fa7b4
diff --git a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
index d07d936..61fa66d 100644
--- a/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
+++ b/jsr166-tests/src/test/java/jsr166/JSR166TestCase.java
@@ -532,11 +532,7 @@
* getPolicy/setPolicy.
*/
public void runWithPermissions(Runnable r, Permission... permissions) {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null) {
- r.run();
- }
- runWithSecurityManagerWithPermissions(r, permissions);
+ r.run();
}
/**
@@ -548,29 +544,7 @@
*/
public void runWithSecurityManagerWithPermissions(Runnable r,
Permission... permissions) {
- SecurityManager sm = System.getSecurityManager();
- if (sm == null) {
- Policy savedPolicy = Policy.getPolicy();
- try {
- Policy.setPolicy(permissivePolicy());
- System.setSecurityManager(new SecurityManager());
- runWithSecurityManagerWithPermissions(r, permissions);
- } finally {
- System.setSecurityManager(null);
- Policy.setPolicy(savedPolicy);
- }
- } else {
- Policy savedPolicy = Policy.getPolicy();
- AdjustablePolicy policy = new AdjustablePolicy(permissions);
- Policy.setPolicy(policy);
-
- try {
- r.run();
- } finally {
- policy.addPermission(new SecurityPermission("setPolicy"));
- Policy.setPolicy(savedPolicy);
- }
- }
+ r.run();
}
/**