Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 68286562: Merge "StrictMode: set sIsIdlerRegistered to false, and don\'t register if no penalties" into honeycomb

Browse Source 
* commit '6828656220f4ed5ae803e4c11fb75fb56bc3ea25':
  StrictMode: set sIsIdlerRegistered to false, and don't register if no penalties
This commit is contained in:
Brad Fitzpatrick
2011-01-20 22:26:50 -08:00
committed by Android Git Automerger
parent d57c1fcf5a 6828656220
commit ca87f0e832
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/android/os/StrictMode.java
View File

@@ -244,13 +244,20 @@ public final class StrictMode {
public static final int PENALTY_GATHER = 0x100; public static final int PENALTY_GATHER = 0x100;
/** /**
* Mask of all the penalty bits. * Mask of all the penalty bits valid for thread policies.
*/ */
private static final int PENALTY_MASK = private static final int THREAD_PENALTY_MASK =
PENALTY_LOG | PENALTY_DIALOG | PENALTY_DEATH | PENALTY_DROPBOX | PENALTY_GATHER | PENALTY_LOG | PENALTY_DIALOG | PENALTY_DEATH | PENALTY_DROPBOX | PENALTY_GATHER |
PENALTY_DEATH_ON_NETWORK | PENALTY_FLASH; PENALTY_DEATH_ON_NETWORK | PENALTY_FLASH;
/**
* Mask of all the penalty bits valid for VM policies.
*/
private static final int VM_PENALTY_MASK =
PENALTY_LOG | PENALTY_DEATH | PENALTY_DROPBOX;
// TODO: wrap in some ImmutableHashMap thing. // TODO: wrap in some ImmutableHashMap thing.
// Note: must be before static initialization of sVmPolicy. // Note: must be before static initialization of sVmPolicy.
private static final HashMap<Class, Integer> EMPTY_CLASS_LIMIT_MAP = new HashMap<Class, Integer>(); private static final HashMap<Class, Integer> EMPTY_CLASS_LIMIT_MAP = new HashMap<Class, Integer>();
@@ -1117,7 +1124,7 @@ public final class StrictMode {
// TODO: if in gather mode, ignore Looper.myLooper() and always // TODO: if in gather mode, ignore Looper.myLooper() and always
// go into this immediate mode? // go into this immediate mode?
if (looper == null || if (looper == null ||
(info.policy & PENALTY_MASK) == PENALTY_DEATH) { (info.policy & THREAD_PENALTY_MASK) == PENALTY_DEATH) {
info.durationMillis = -1; // unknown (redundant, already set) info.durationMillis = -1; // unknown (redundant, already set)
handleViolation(info); handleViolation(info);
return; return;
@@ -1254,7 +1261,7 @@ public final class StrictMode {
violationMaskSubset |= violationBit; violationMaskSubset |= violationBit;
final int savedPolicyMask = getThreadPolicyMask(); final int savedPolicyMask = getThreadPolicyMask();
final boolean justDropBox = (info.policy & PENALTY_MASK) == PENALTY_DROPBOX; final boolean justDropBox = (info.policy & THREAD_PENALTY_MASK) == PENALTY_DROPBOX;
if (justDropBox) { if (justDropBox) {
// If all we're going to ask the activity manager // If all we're going to ask the activity manager
// to do is dropbox it (the common case during // to do is dropbox it (the common case during
@@ -1413,8 +1420,10 @@ public final class StrictMode {
Looper looper = Looper.getMainLooper(); Looper looper = Looper.getMainLooper();
if (looper != null) { if (looper != null) {
MessageQueue mq = looper.mQueue; MessageQueue mq = looper.mQueue;
if (policy.classInstanceLimit.size() == 0) { if (policy.classInstanceLimit.size() == 0 ||
(sVmPolicyMask & VM_PENALTY_MASK) == 0) {
mq.removeIdleHandler(sProcessIdleHandler); mq.removeIdleHandler(sProcessIdleHandler);
sIsIdlerRegistered = false;
} else if (!sIsIdlerRegistered) { } else if (!sIsIdlerRegistered) {
mq.addIdleHandler(sProcessIdleHandler); mq.addIdleHandler(sProcessIdleHandler);
sIsIdlerRegistered = true; sIsIdlerRegistered = true;