Merge branch 'jb38804' into 'master'

[devicelock] Add an option to clear external storage on device reset. Contributes to JB#38804 See merge request !25
sailfishos · Jun 14, 2017 · 82172d2 · 82172d2
2 parents 7079f03 + dd9240a
commit 82172d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/nemo-devicelock/devicereset.cpp b/src/nemo-devicelock/devicereset.cpp
@@ -47,6 +47,7 @@ namespace NemoDeviceLock
     \value Shutdown Shutdown the device after reset.
     \value Reboot   Reboot the device after reset.
     \value WipePartitions Zero all bytes not overwritten by the factory image.
+    \value ClearExternalMedia Data on external storage will also be deleted.
 */
 
 /*!

diff --git a/src/nemo-devicelock/devicereset.h b/src/nemo-devicelock/devicereset.h
@@ -49,7 +49,8 @@ class NEMODEVICELOCK_EXPORT DeviceReset : public QObject, private ConnectionClie
     enum Option {
         Shutdown        = 0x00,
         Reboot          = 0x01,
-        WipePartitions  = 0x02
+        WipePartitions  = 0x02,
+        ClearExternalMedia = 0x04
     };
     Q_ENUM(Option)
     Q_DECLARE_FLAGS(Options, Option)