diff options
| -rw-r--r-- | core/java/android/os/StrictMode.java | 20 | ||||
| -rw-r--r-- | core/tests/benchmarks/src/android/os/StrictModeBenchmark.java | 34 |
2 files changed, 49 insertions, 5 deletions
diff --git a/core/java/android/os/StrictMode.java b/core/java/android/os/StrictMode.java index 31da09107ba5..a9abdc575779 100644 --- a/core/java/android/os/StrictMode.java +++ b/core/java/android/os/StrictMode.java @@ -783,13 +783,15 @@ public final class StrictMode { BlockGuard.setThreadPolicy(BlockGuard.LAX_POLICY); return; } - BlockGuard.Policy policy = BlockGuard.getThreadPolicy(); - if (!(policy instanceof AndroidBlockGuardPolicy)) { - BlockGuard.setThreadPolicy(new AndroidBlockGuardPolicy(policyMask)); + final BlockGuard.Policy policy = BlockGuard.getThreadPolicy(); + final AndroidBlockGuardPolicy androidPolicy; + if (policy instanceof AndroidBlockGuardPolicy) { + androidPolicy = (AndroidBlockGuardPolicy) policy; } else { - AndroidBlockGuardPolicy androidPolicy = (AndroidBlockGuardPolicy) policy; - androidPolicy.setPolicyMask(policyMask); + androidPolicy = threadAndroidPolicy.get(); + BlockGuard.setThreadPolicy(androidPolicy); } + androidPolicy.setPolicyMask(policyMask); } // Sets up CloseGuard in Dalvik/libcore @@ -1060,6 +1062,14 @@ public final class StrictMode { } }; + private static final ThreadLocal<AndroidBlockGuardPolicy> + threadAndroidPolicy = new ThreadLocal<AndroidBlockGuardPolicy>() { + @Override + protected AndroidBlockGuardPolicy initialValue() { + return new AndroidBlockGuardPolicy(0); + } + }; + private static boolean tooManyViolationsThisLoop() { return violationsBeingTimed.get().size() >= MAX_OFFENSES_PER_LOOP; } diff --git a/core/tests/benchmarks/src/android/os/StrictModeBenchmark.java b/core/tests/benchmarks/src/android/os/StrictModeBenchmark.java new file mode 100644 index 000000000000..41af382071ca --- /dev/null +++ b/core/tests/benchmarks/src/android/os/StrictModeBenchmark.java @@ -0,0 +1,34 @@ +/* + * Copyright (C) 2013 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.os; + +import android.os.StrictMode.ThreadPolicy; + +import com.google.caliper.SimpleBenchmark; + +public class StrictModeBenchmark extends SimpleBenchmark { + + private ThreadPolicy mOff = new ThreadPolicy.Builder().build(); + private ThreadPolicy mOn = new ThreadPolicy.Builder().detectAll().build(); + + public void timeToggleThreadPolicy(int reps) { + for (int i = 0; i < reps; i++) { + StrictMode.setThreadPolicy(mOn); + StrictMode.setThreadPolicy(mOff); + } + } +} |