Merge "StrictMode: batch drop box writes for system apps" into gingerbread

2010-07-15 15:43:03 -07:00
parent 1772c34e53 ad13b9807b
commit 0c36c96f2a
2 changed files with 138 additions and 38 deletions
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -3102,7 +3102,9 @@ public final class ActivityThread {
         * For system applications on userdebug/eng builds, log stack
         * traces of disk and network access to dropbox for analysis.
         */
-        if ((data.appInfo.flags&ApplicationInfo.FLAG_SYSTEM) != 0 &&
+        if ((data.appInfo.flags &
+             (ApplicationInfo.FLAG_SYSTEM |
+              ApplicationInfo.FLAG_UPDATED_SYSTEM_APP)) != 0 &&
            !"user".equals(Build.TYPE)) {
            StrictMode.setThreadBlockingPolicy(
                StrictMode.DISALLOW_DISK_WRITE |