Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add storage fullness methods to volume provider." into oc-dev

Browse Source
This commit is contained in:
Daniel Nishi
2017-04-05 19:59:12 +00:00
committed by Android (Google) Code Review
parent b24399547c 2860cf63fd
commit 4566fd3abc
3 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsLib/src/com/android/settingslib/deviceinfo/PrivateStorageInfo.java
View File

@@ -41,8 +41,8 @@ public class PrivateStorageInfo {
long privateTotalBytes = 0; long privateTotalBytes = 0;
for (VolumeInfo info : sm.getVolumes()) { for (VolumeInfo info : sm.getVolumes()) {
if (info.getType() == VolumeInfo.TYPE_PRIVATE && info.isMountedReadable()) { if (info.getType() == VolumeInfo.TYPE_PRIVATE && info.isMountedReadable()) {
privateTotalBytes += stats.getTotalBytes(info.getFsUuid()); privateTotalBytes += sm.getTotalBytes(stats, info);
privateFreeBytes += stats.getFreeBytes(info.getFsUuid()); privateFreeBytes += sm.getFreeBytes(stats, info);
} }
} }
return new PrivateStorageInfo(privateFreeBytes, privateTotalBytes); return new PrivateStorageInfo(privateFreeBytes, privateTotalBytes);

11
packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageManagerVolumeProvider.java
View File

@@ -16,6 +16,7 @@
package com.android.settingslib.deviceinfo; package com.android.settingslib.deviceinfo;
import android.app.usage.StorageStatsManager;
import android.os.storage.StorageManager; import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
@@ -46,4 +47,14 @@ public class StorageManagerVolumeProvider implements StorageVolumeProvider {
public VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume) { public VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume) {
return mStorageManager.findEmulatedForPrivate(privateVolume); return mStorageManager.findEmulatedForPrivate(privateVolume);
} }
@Override
public long getTotalBytes(StorageStatsManager stats, VolumeInfo volume) {
return stats.getTotalBytes(volume.getFsUuid());
}
@Override
public long getFreeBytes(StorageStatsManager stats, VolumeInfo volume) {
return stats.getFreeBytes(volume.getFsUuid());
}
} }

15
packages/SettingsLib/src/com/android/settingslib/deviceinfo/StorageVolumeProvider.java
View File

@@ -16,6 +16,7 @@
package com.android.settingslib.deviceinfo; package com.android.settingslib.deviceinfo;
import android.app.usage.StorageStatsManager;
import android.os.storage.VolumeInfo; import android.os.storage.VolumeInfo;
import java.util.List; import java.util.List;
@@ -39,4 +40,18 @@ public interface StorageVolumeProvider {
* Returns the emulated volume for a given private volume. * Returns the emulated volume for a given private volume.
*/ */
VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume); VolumeInfo findEmulatedForPrivate(VolumeInfo privateVolume);
/**
* Returns the total bytes for a given storage volume.
*
* @pre The volume is a private volume and is readable.
*/
long getTotalBytes(StorageStatsManager stats, VolumeInfo volume);
/**
* Returns the free bytes for a given storage volume.
*
* @pre The volume is a private volume and is readable.
*/
long getFreeBytes(StorageStatsManager stats, VolumeInfo volume);
} }