From 706e7014d8c3de42d5e18fcffbd07af96cc754b6 Mon Sep 17 00:00:00 2001
From: Zoltan Szatmary-Ban <szatmz@google.com>
Date: Mon, 13 Jul 2015 12:37:31 +0100
Subject: [PATCH] Do not throw exception when MeasurementDetails.mediaSize is
 empty

It is legitimate for StorageMeasurement.measureExactStorage to return without any user keys
added to the returned MeasurementDetails, when the following is true:

mVolume == null || !mVolume.isMountedReadable()

Bug: 22394495
Change-Id: Ie40bd468a487208d98dc56aae41fdad7098f41a5
---
 src/com/android/settings/deviceinfo/PrivateVolumeSettings.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index cf62014c75d..ae89c04c15f 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -533,8 +533,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
                 }
             }
         } else {
-            throw new IllegalStateException(
-                    "MeasurementDetails mediaSize array does not have key for user " + userId);
+            Log.w(TAG, "MeasurementDetails mediaSize array does not have key for user " + userId);
         }
         return total;
     }