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

Change-Id: I15d036b2008e83b2168247c9108fec8b0392fb3f

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();