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

Merge "Don't update quota for non-emulated volumes." into rvc-dev am: 29d6a24fbf am: 81018616a3

Browse Source 
Change-Id: I05c9a975b7e8a8860b6d31719870294471b618e7
This commit is contained in:
Martijn Coenen
2020-04-21 13:03:16 +00:00
committed by Automerger Merge Worker
parent 290ef8a3a1 81018616a3
commit d28884ba03
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/android/os/storage/StorageManager.java
View File

@@ -2447,7 +2447,12 @@ public class StorageManager {
final String filePath = path.getCanonicalPath(); final String filePath = path.getCanonicalPath();
final StorageVolume volume = getStorageVolume(path); final StorageVolume volume = getStorageVolume(path);
if (volume == null) { if (volume == null) {
throw new IllegalStateException("Failed to update quota type for " + filePath); Log.w(TAG, "Failed to update quota type for " + filePath);
return;
}
if (!volume.isEmulated()) {
// We only support quota tracking on emulated filesystems
return;
} }
final int userId = volume.getOwner().getIdentifier(); final int userId = volume.getOwner().getIdentifier();