summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2012-04-19 14:19:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-04-19 14:19:50 -0700
commit40e8b8ad94c0c04b2cce4d55c88464d439c4593d (patch)
treeb6e68a11306243acc0e9e47106c9bc93077a7f7a
parentf3dbb59f1d199b6db539c84d371a2e55c7a6bd05 (diff)
parent4b49657c7f78f8cee30804f8b31a004a11fffd7f (diff)
downloadframeworks_base-40e8b8ad94c0c04b2cce4d55c88464d439c4593d.zip
frameworks_base-40e8b8ad94c0c04b2cce4d55c88464d439c4593d.tar.gz
frameworks_base-40e8b8ad94c0c04b2cce4d55c88464d439c4593d.tar.bz2
Merge "Log when /cache files are deleted."
-rw-r--r--services/java/com/android/server/DeviceStorageMonitorService.java16
-rw-r--r--services/java/com/android/server/EventLogTags.logtags4
2 files changed, 19 insertions, 1 deletions
diff --git a/services/java/com/android/server/DeviceStorageMonitorService.java b/services/java/com/android/server/DeviceStorageMonitorService.java
index b943c09..0ed5189 100644
--- a/services/java/com/android/server/DeviceStorageMonitorService.java
+++ b/services/java/com/android/server/DeviceStorageMonitorService.java
@@ -26,6 +26,7 @@ import android.content.pm.IPackageDataObserver;
import android.content.pm.IPackageManager;
import android.os.Binder;
import android.os.Environment;
+import android.os.FileObserver;
import android.os.Handler;
import android.os.Message;
import android.os.Process;
@@ -91,6 +92,7 @@ public class DeviceStorageMonitorService extends Binder {
private Intent mStorageFullIntent;
private Intent mStorageNotFullIntent;
private CachePackageDataObserver mClearCacheObserver;
+ private final CacheFileDeletedObserver mCacheFileDeletedObserver;
private static final int _TRUE = 1;
private static final int _FALSE = 0;
private long mMemLowThreshold;
@@ -324,6 +326,9 @@ public class DeviceStorageMonitorService extends Binder {
mMemLowThreshold = getMemThreshold();
mMemFullThreshold = getMemFullThreshold();
checkMemory(true);
+
+ mCacheFileDeletedObserver = new CacheFileDeletedObserver();
+ mCacheFileDeletedObserver.startWatching();
}
@@ -419,4 +424,15 @@ public class DeviceStorageMonitorService extends Binder {
public boolean isMemoryLow() {
return mLowMemFlag;
}
+
+ public static class CacheFileDeletedObserver extends FileObserver {
+ public CacheFileDeletedObserver() {
+ super(Environment.getDownloadCacheDirectory().getAbsolutePath(), FileObserver.DELETE);
+ }
+
+ @Override
+ public void onEvent(int event, String path) {
+ EventLogTags.writeCacheFileDeleted(path);
+ }
+ }
}
diff --git a/services/java/com/android/server/EventLogTags.logtags b/services/java/com/android/server/EventLogTags.logtags
index 0bcec2e..249513f 100644
--- a/services/java/com/android/server/EventLogTags.logtags
+++ b/services/java/com/android/server/EventLogTags.logtags
@@ -36,7 +36,7 @@ option java_package com.android.server
# ---------------------------
-# DeviceStorageMonitoryService.java
+# DeviceStorageMonitorService.java
# ---------------------------
# The disk space free on the /data partition, in bytes
2744 free_storage_changed (data|2|2)
@@ -44,6 +44,8 @@ option java_package com.android.server
2745 low_storage (data|2|2)
# disk space free on the /data, /system, and /cache partitions in bytes
2746 free_storage_left (data|2|2),(system|2|2),(cache|2|2)
+# file on cache partition was deleted
+2748 cache_file_deleted (path|3)
# ---------------------------