Merge "Gracefully finish when missing volume." into mnc-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3d74e5d..adbb7c1 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4241,10 +4241,12 @@
<!-- Menu label for refreshing with latest usage numbers -->
<string name="menu_stats_refresh">Refresh</string>
- <!-- Label for kernel threads -->
+ <!-- Label for kernel threads in battery usage -->
<string name="process_kernel_label">Android OS</string>
- <!-- Label for mediaserver process -->
+ <!-- Label for mediaserver process in battery usage -->
<string name="process_mediaserver_label">Mediaserver</string>
+ <!-- Label for dex2oat process used for app optimization in battery usage -->
+ <string name="process_dex2oat_label">App optimization</string>
<!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
<string name="battery_saver">Battery saver</string>
diff --git a/src/com/android/settings/deviceinfo/StorageWizardInit.java b/src/com/android/settings/deviceinfo/StorageWizardInit.java
index 3c33dfd..a72872c 100644
--- a/src/com/android/settings/deviceinfo/StorageWizardInit.java
+++ b/src/com/android/settings/deviceinfo/StorageWizardInit.java
@@ -84,7 +84,8 @@
@Override
public void onNavigateNext() {
if (mRadioExternal.isChecked()) {
- if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC) {
+ if (mVolume != null && mVolume.getType() == VolumeInfo.TYPE_PUBLIC
+ && mVolume.getState() != VolumeInfo.STATE_UNMOUNTABLE) {
// Remember that user made decision
mStorage.setVolumeInited(mVolume.getFsUuid(), true);
diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 8227c71..edab729 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -225,6 +225,8 @@
name = context.getResources().getString(R.string.process_kernel_label);
} else if ("mediaserver".equals(name)) {
name = context.getResources().getString(R.string.process_mediaserver_label);
+ } else if ("dex2oat".equals(name)) {
+ name = context.getResources().getString(R.string.process_dex2oat_label);
}
iconId = R.drawable.ic_power_system;
icon = context.getDrawable(iconId);