summaryrefslogtreecommitdiffstats
path: root/partition.cpp
diff options
context:
space:
mode:
authorthat <github@that.at>2014-10-08 00:01:24 +0200
committerDees Troy <dees_troy@teamw.in>2014-10-08 18:34:39 +0200
commit9e0593eaf6defb15761f41246093c0d3661b140d (patch)
treeb9c42ddb95087c735d50b8ce34b5aee529adc5cb /partition.cpp
parentUpdate RECOVERY_VARIANT blocking to use project-path-for (diff)
downloadandroid_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar.gz
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar.bz2
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar.lz
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar.xz
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.tar.zst
android_bootable_recovery-9e0593eaf6defb15761f41246093c0d3661b140d.zip
Diffstat (limited to '')
-rw-r--r--partition.cpp16
1 files changed, 3 insertions, 13 deletions
diff --git a/partition.cpp b/partition.cpp
index 31a3f8fae..add9460fc 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -108,8 +108,7 @@ static struct flag_list mount_flags[] = {
{ 0, 0 },
};
-TWPartition::TWPartition(int *id) {
- initmtpid = id;
+TWPartition::TWPartition() {
Can_Be_Mounted = false;
Can_Be_Wiped = false;
Can_Be_Backed_Up = false;
@@ -161,7 +160,6 @@ TWPartition::TWPartition(int *id) {
#ifdef TW_INCLUDE_CRYPTO_SAMSUNG
EcryptFS_Password = "";
#endif
- mtpid = 0;
}
TWPartition::~TWPartition(void) {
@@ -275,7 +273,7 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
Can_Encrypt_Backup = true;
Use_Userdata_Encryption = true;
if (datamedia)
- Setup_Data_Media(0);
+ Setup_Data_Media();
#ifdef TW_INCLUDE_CRYPTO
Can_Be_Encrypted = true;
char crypto_blkdev[255];
@@ -411,12 +409,6 @@ bool TWPartition::Process_Fstab_Line(string Line, bool Display_Error) {
}
}
- // Generate MTP ID
- if (Is_Storage) {
- (*initmtpid)++;
- mtpid = *initmtpid;
- }
-
// Process any custom flags
if (Flags.size() > 0)
Process_Flags(Flags, Display_Error);
@@ -682,7 +674,7 @@ void TWPartition::Setup_AndSec(void) {
Mount_Storage_Retry();
}
-void TWPartition::Setup_Data_Media(int mtp) {
+void TWPartition::Setup_Data_Media() {
LOGINFO("Setting up '%s' as data/media emulated storage.\n", Mount_Point.c_str());
Storage_Name = "Internal Storage";
Has_Data_Media = true;
@@ -703,8 +695,6 @@ void TWPartition::Setup_Data_Media(int mtp) {
DataManager::SetValue(TW_INTERNAL_PATH, "/data/media/0");
UnMount(true);
}
- if (mtp)
- mtpid = mtp;
DataManager::SetValue("tw_has_internal", 1);
DataManager::SetValue("tw_has_data_media", 1);
du.add_absolute_dir("/data/media");