am 7e40e67f: am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

Merge commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039'

* commit '7e40e67f73e0e9fa61a9601d82e8a207ffdca039':
  Add "none" for vold and deprecate mkobb -c
This commit is contained in:
Kenny Root
2010-10-01 17:07:21 -07:00
committed by Android Git Automerger
2 changed files with 4 additions and 4 deletions

View File

@@ -1981,7 +1981,8 @@ class MountService extends IMountService.Stub
}
rc = StorageResultCode.OperationSucceeded;
String cmd = String.format("obb mount %s %s %d", mObbState.filename, mKey,
String cmd = String.format("obb mount %s %s %d", mObbState.filename,
mKey != null ? mKey : "none",
mObbState.callerUid);
try {
mConnector.doCommand(cmd);