diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-09-07 16:35:56 -0700 |
|---|---|---|
| committer | Ben Komalo <benkomalo@google.com> | 2011-09-09 14:44:40 -0700 |
| commit | 13c7197da8a16f77f6398708a6314c80cb01e0d1 (patch) | |
| tree | 092ded9f3fd6a3d59b4840f640f2cf4abb4ff45c /libs/storage | |
| parent | 920d06db8dd2d6380a437fd03cb54b8caac92cee (diff) | |
| download | frameworks_base-13c7197da8a16f77f6398708a6314c80cb01e0d1.zip frameworks_base-13c7197da8a16f77f6398708a6314c80cb01e0d1.tar.gz frameworks_base-13c7197da8a16f77f6398708a6314c80cb01e0d1.tar.bz2 | |
Revert encryption mapping for device wipes.
External storage volumes that were emulated+encrypted needed to have
their encryption mapping removed so that it doesn't try to encrypt the
volume after formatting them.
This just wires through an argument through vold, and assumes that vold
will do the right thing even if there is no encryption mapping set.
Bug: 5017638
Change-Id: I858fae3d12cb415bc34637f520f71220ad9daaad
Diffstat (limited to 'libs/storage')
| -rw-r--r-- | libs/storage/IMountService.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/storage/IMountService.cpp b/libs/storage/IMountService.cpp index 7fbf67a..8ddbeae 100644 --- a/libs/storage/IMountService.cpp +++ b/libs/storage/IMountService.cpp @@ -157,12 +157,13 @@ public: return reply.readInt32(); } - int32_t unmountVolume(const String16& mountPoint, const bool force) + int32_t unmountVolume(const String16& mountPoint, const bool force, const bool removeEncryption) { Parcel data, reply; data.writeInterfaceToken(IMountService::getInterfaceDescriptor()); data.writeString16(mountPoint); data.writeInt32(force ? 1 : 0); + data.writeInt32(removeEncryption ? 1 : 0); if (remote()->transact(TRANSACTION_unmountVolume, data, &reply) != NO_ERROR) { LOGD("unmountVolume could not contact remote\n"); return -1; |