Tweak OEM mode

Change-Id: Ic440e33fa22aa7b082097366f10b333cc945362a
This commit is contained in:
Ethan Yonker
2014-04-04 13:33:30 -05:00
parent 5c9336924f
commit 7af51ce521
2 changed files with 7 additions and 24 deletions
+1 -21
View File
@@ -1109,28 +1109,8 @@ void DataManager::ReadSettingsFile(void)
LOGINFO("Attempt to load settings from settings file...\n");
LoadValues(settings_file);
Output_Version();
GetValue(TW_HAS_DUAL_STORAGE, has_dual);
GetValue(TW_USE_EXTERNAL_STORAGE, use_ext);
GetValue(TW_HAS_EXTERNAL, has_ext);
if (has_dual != 0 && use_ext == 1) {
// Attempt to switch to using external storage
if (!PartitionManager.Mount_Current_Storage(false)) {
LOGERR("Failed to mount external storage, using internal storage.\n");
// Remount failed, default back to internal storage
SetValue(TW_USE_EXTERNAL_STORAGE, 0);
PartitionManager.Mount_Current_Storage(true);
}
} else {
PartitionManager.Mount_Current_Storage(true);
}
if (has_ext) {
string ext_path;
GetValue(TW_EXTERNAL_PATH, ext_path);
PartitionManager.Mount_By_Path(ext_path, 0);
}
#endif // ifdef TW_OEM_BUILD
PartitionManager.Mount_All_Storage();
update_tz_environment_variables();
#ifdef TW_MAX_BRIGHTNESS
if (strcmp(EXPAND(TW_BRIGHTNESS_PATH), "/nobrightness") != 0) {