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 /include/storage/IMountService.h | |
| 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 'include/storage/IMountService.h')
| -rw-r--r-- | include/storage/IMountService.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/storage/IMountService.h b/include/storage/IMountService.h index 472d8e5..43df7f0 100644 --- a/include/storage/IMountService.h +++ b/include/storage/IMountService.h @@ -37,8 +37,8 @@ public: virtual void setUsbMassStorageEnabled(const bool enable) = 0; virtual bool isUsbMassStorageEnabled() = 0; virtual int32_t mountVolume(const String16& mountPoint) = 0; - virtual int32_t - unmountVolume(const String16& mountPoint, const bool force) = 0; + virtual int32_t unmountVolume( + const String16& mountPoint, const bool force, const bool removeEncryption) = 0; virtual int32_t formatVolume(const String16& mountPoint) = 0; virtual int32_t getStorageUsers(const String16& mountPoint, int32_t** users) = 0; |