From fcf3f24856c599c922880c64b01b7610603f958c Mon Sep 17 00:00:00 2001
From: Ethan Yonker <dees_troy@teamw.in>
Date: Tue, 16 Feb 2016 12:30:26 -0600
Subject: Fix adopted storage when andsec flag is present

Change-Id: If903d838abc920f952f243482338188c15bb1dbf
---
 partition.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'partition.cpp')

diff --git a/partition.cpp b/partition.cpp
index df03336c4..354563466 100644
--- a/partition.cpp
+++ b/partition.cpp
@@ -2526,6 +2526,17 @@ int TWPartition::Decrypt_Adopted() {
 				cryptfs_revert_ext_volume(part_guid);
 				ret = 1;
 			} else {
+				UnMount(false);
+				Has_Android_Secure = false;
+				Symlink_Path = "";
+				Symlink_Mount_Point = "";
+				Backup_Name = Mount_Point.substr(1);
+				Backup_Path = Mount_Point;
+				TWPartition* sdext = PartitionManager.Find_Partition_By_Path("/sd-ext");
+				if (sdext && sdext->Actual_Block_Device == Adopted_Block_Device) {
+					LOGINFO("Removing /sd-ext from partition list due to adopted storage\n");
+					PartitionManager.Remove_Partition_By_Path("/sd-ext");
+				}
 				Setup_Data_Media();
 				Recreate_Media_Folder();
 				Wipe_Available_in_GUI = true;
-- 
cgit v1.2.3