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

Change-Id: I249f8ac6294de72f7f9d31ae2b80fc7ce10ad501
2020-04-21 13:16:59 +00:00
parent 1cd5f5a5dd d28884ba03
commit 25125bfd8d
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();