diff options
| author | Brad Fitzpatrick <bradfitz@android.com> | 2010-09-15 11:37:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 11:37:54 -0700 |
| commit | b835d9abd6d7c89bb1226fc83d1e96b3b04b9ee3 (patch) | |
| tree | 59f1f4be11f27bb3464b40ef7b3f9f1ae2067449 /core/java/android/app/ActivityThread.java | |
| parent | 562ec84987780e8938f8d1210790ba7280da470a (diff) | |
| parent | f26ac1f8ed27d9e88bbde8978557c34788c7509c (diff) | |
| download | frameworks_base-b835d9abd6d7c89bb1226fc83d1e96b3b04b9ee3.zip frameworks_base-b835d9abd6d7c89bb1226fc83d1e96b3b04b9ee3.tar.gz frameworks_base-b835d9abd6d7c89bb1226fc83d1e96b3b04b9ee3.tar.bz2 | |
am f26ac1f8: am 96d6c345: Merge "Unify some duplicate StrictMode-enabling code." into gingerbread
Merge commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c'
* commit 'f26ac1f8ed27d9e88bbde8978557c34788c7509c':
Unify some duplicate StrictMode-enabling code.
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 60fcdc4..c0e2987 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -3154,18 +3154,11 @@ public final class ActivityThread { /** * For system applications on userdebug/eng builds, log stack * traces of disk and network access to dropbox for analysis. - * - * Similar logic exists in SystemServer.java. */ if ((data.appInfo.flags & (ApplicationInfo.FLAG_SYSTEM | - ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0 && - !"user".equals(Build.TYPE)) { - StrictMode.setThreadPolicy( - StrictMode.DISALLOW_DISK_WRITE | - StrictMode.DISALLOW_DISK_READ | - StrictMode.DISALLOW_NETWORK | - StrictMode.PENALTY_DROPBOX); + ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0) { + StrictMode.conditionallyEnableDebugLogging(); } /** |