Merge "Remove the cache size from internal size." into qt-dev

    private long getTotalInternalSize(PackageStats ps) {

        if (ps != null) {

            return ps.codeSize + ps.dataSize;

            // We subtract the cache size because the system can clear it automatically and

            // |dataSize| is a superset of |cacheSize|.

            return ps.codeSize + ps.dataSize - ps.cacheSize;

        }

        return SIZE_INVALID;

    }

    private long getTotalExternalSize(PackageStats ps) {

        if (ps != null) {

            // We also include the cache size here because for non-emulated

            // we don't automtically clean cache files.

            // we don't automatically clean cache files.

            return ps.externalCodeSize + ps.externalDataSize

                    + ps.externalCacheSize

                    + ps.externalMediaSize + ps.externalObbSize;

        shadowContext.setSystemService(Context.STORAGE_STATS_SERVICE, mStorageStatsManager);

        StorageStats storageStats = new StorageStats();

        storageStats.codeBytes = 10;

        storageStats.dataBytes = 20;

        storageStats.cacheBytes = 30;

        // Data bytes are a superset of cache bytes.

        storageStats.dataBytes = storageStats.cacheBytes + 20;

        when(mStorageStatsManager.queryStatsForPackage(any(UUID.class),

            anyString(), any(UserHandle.class))).thenReturn(storageStats);