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

Merge "Use annotation instead of comment"

Browse Source
This commit is contained in:
Kurt Nelson
2017-10-26 00:09:12 +00:00
committed by Android (Google) Code Review
parent 794fab5b4c 1981f4292d
commit 826d12cf92
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,6 +34,7 @@ import android.util.Singleton;
import android.util.Slog;
import android.view.IWindowManager;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.os.RuntimeInit;
import com.android.internal.util.FastPrintWriter;
import com.android.internal.util.HexDump;
@@ -2247,9 +2248,8 @@ public final class StrictMode {
((AndroidBlockGuardPolicy) policy).onWriteToDisk();
}
// Guarded by StrictMode.class
private static final HashMap<Class, Integer> sExpectedActivityInstanceCount =
new HashMap<Class, Integer>();
@GuardedBy("StrictMode.class")
private static final HashMap<Class, Integer> sExpectedActivityInstanceCount = new HashMap<>();
/**
* Returns an object that is used to track instances of activites. The activity should store a