From 66a1949df91cc558bf5573c395fa9084c1365e81 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Thu, 10 Dec 2015 10:19:45 -0600 Subject: Adopted Storage support -Detects, decrypts, and mounts an adopted SD card if a secondary block device is defined (usually mmcblk1) -Handles unified storage -Displays the adopted storage in MTP along with internal -Factory Reset - wiped just like a data media device, we retain the keys folder and the storage.xml during a factory reset -Backup / Restore -Disable mass storage when adopted storage is present -Read storage nickname from storage.xml and apply it to display names in the GUI -Read storage.xml and determine what storage location is in use for /sdcard and remap accordingly libgpt_twrp is source code mostly kanged from an efimanager project. It is GPL v2 or higher, so we will opt for GPL v3. Change-Id: Ieda0030bec5155ba8d2b9167dc0016cebbf39d55 --- data.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'data.cpp') diff --git a/data.cpp b/data.cpp index cda6828de..77e8f8de4 100644 --- a/data.cpp +++ b/data.cpp @@ -744,7 +744,7 @@ void DataManager::SetDefaultValues() mConstValues.insert(make_pair(TW_HAS_USB_STORAGE, "0")); } else { LOGINFO("Lun file '%s'\n", Lun_File_str.c_str()); - mConstValues.insert(make_pair(TW_HAS_USB_STORAGE, "1")); + mValues.insert(make_pair(TW_HAS_USB_STORAGE, make_pair("1", 0))); } #endif #ifdef TW_INCLUDE_INJECTTWRP @@ -923,6 +923,8 @@ void DataManager::SetDefaultValues() mValues.insert(make_pair("tw_language", make_pair(EXPAND(TW_DEFAULT_LANGUAGE), 1))); LOGINFO("LANG: %s\n", EXPAND(TW_DEFAULT_LANGUAGE)); + mValues.insert(make_pair("tw_has_adopted_storage", make_pair("0", 0))); + pthread_mutex_unlock(&m_valuesLock); } -- cgit v1.2.3