summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/deviceinfo
diff options
context:
space:
mode:
authorZoltan Szatmary-Ban <szatmz@google.com>2015-07-13 13:09:53 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-07-13 13:09:54 +0000
commit098c296df2388bbcc906e8e149743eea7467b0a8 (patch)
treea86c68100e0ae9cd1c4fdc95817054b3c92d4fb9 /src/com/android/settings/deviceinfo
parentda15ade8300bb875b8d874e1f68032f6ffe95719 (diff)
parent706e7014d8c3de42d5e18fcffbd07af96cc754b6 (diff)
downloadpackages_apps_Settings-098c296df2388bbcc906e8e149743eea7467b0a8.zip
packages_apps_Settings-098c296df2388bbcc906e8e149743eea7467b0a8.tar.gz
packages_apps_Settings-098c296df2388bbcc906e8e149743eea7467b0a8.tar.bz2
Merge "Do not throw exception when MeasurementDetails.mediaSize is empty" into mnc-dev
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r--src/com/android/settings/deviceinfo/PrivateVolumeSettings.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
index 991aeb7..9a6b7a7 100644
--- a/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
+++ b/src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
@@ -527,8 +527,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;
}