am 0ad922f0: Merge "Display OBB usage as part of app details" into honeycomb

* commit '0ad922f0ceee31da2a5b242ecfbaeff74e1f0003': Display OBB usage as part of app details
2011-01-18 14:14:14 -08:00
parent 99b6deb134 0ad922f0ce
commit 43282b19d1
1 changed files with 2 additions and 1 deletions
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -636,7 +636,8 @@ public class ApplicationsState {

    private long getTotalExternalSize(PackageStats ps) {
        if (ps != null) {
-            return ps.externalDataSize + ps.externalMediaSize + ps.externalCacheSize;
+            return ps.externalDataSize + ps.externalMediaSize + ps.externalCacheSize
+                    + ps.externalObbSize;
        }
        return SIZE_INVALID;
    }