Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6c048260: Merge "Revert encryption mapping for device wipes."

Browse Source 
* commit '6c048260f30d9bba1a83c4f79388cd6b3109be7d':
  Revert encryption mapping for device wipes.
This commit is contained in:
Ben Komalo
2011-09-11 16:53:00 -07:00
committed by Android Git Automerger
parent da286299f4 6c048260f3
commit 4b2efcb26f
7 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java/android/os/storage/IMountService.java
View File

@@ -169,13 +169,15 @@ public interface IMountService extends IInterface {
* is an asynchronous operation. Applications should register
* StorageEventListener for storage related status changes.
*/
public void unmountVolume(String mountPoint, boolean force) throws RemoteException {
public void unmountVolume(String mountPoint, boolean force, boolean removeEncryption)
throws RemoteException {
Parcel _data = Parcel.obtain();
Parcel _reply = Parcel.obtain();
try {
_data.writeInterfaceToken(DESCRIPTOR);
_data.writeString(mountPoint);
_data.writeInt((force ? 1 : 0));
_data.writeInt((removeEncryption ? 1 : 0));
mRemote.transact(Stub.TRANSACTION_unmountVolume, _data, _reply, 0);
_reply.readException();
} finally {
@@ -842,9 +844,9 @@ public interface IMountService extends IInterface {
data.enforceInterface(DESCRIPTOR);
String mountPoint;
mountPoint = data.readString();
boolean force;
force = 0 != data.readInt();
unmountVolume(mountPoint, force);
boolean force = 0 != data.readInt();
boolean removeEncrypt = 0 != data.readInt();
unmountVolume(mountPoint, force, removeEncrypt);
reply.writeNoException();
return true;
}
@@ -1234,8 +1236,14 @@ public interface IMountService extends IInterface {
* Safely unmount external storage at given mount point. The unmount is an
* asynchronous operation. Applications should register StorageEventListener
* for storage related status changes.
* @param mountPoint the mount point
* @param force whether or not to forcefully unmount it (e.g. even if programs are using this
* data currently)
* @param removeEncryption whether or not encryption mapping should be removed from the volume.
* This value implies {@code force}.
*/
public void unmountVolume(String mountPoint, boolean force) throws RemoteException;
public void unmountVolume(String mountPoint, boolean force, boolean removeEncryption)
throws RemoteException;
/**
* Unregisters an IMountServiceListener