Merge "Don't update quota for non-emulated volumes." into rvc-dev

2020-04-21 12:22:48 +00:00
parent e66ac51ea3 1b981a3aea
commit 29d6a24fbf
1 changed files with 6 additions and 1 deletions
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -2447,7 +2447,12 @@ public class StorageManager {
        final String filePath = path.getCanonicalPath();
        final StorageVolume volume = getStorageVolume(path);
        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();