diff options
| author | 2010-10-01 15:11:22 -0700 | |
|---|---|---|
| committer | 2010-10-01 15:11:22 -0700 | |
| commit | 7e40e67f73e0e9fa61a9601d82e8a207ffdca039 (patch) | |
| tree | 88b12a0c64fc835ade01d012a827c26e36c4b42b | |
| parent | 007d5b2cf6af32dfe96c0c04988d090b872afb01 (diff) | |
| parent | d9e88d22f0ffefdc6a3b9c59168bd1bb6d402486 (diff) | |
am d9e88d22: Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread
Merge commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486' into gingerbread-plus-aosp
* commit 'd9e88d22f0ffefdc6a3b9c59168bd1bb6d402486':
Add "none" for vold and deprecate mkobb -c
| -rw-r--r-- | services/java/com/android/server/MountService.java | 3 | ||||
| -rwxr-xr-x | tools/obbtool/mkobb.sh | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/java/com/android/server/MountService.java b/services/java/com/android/server/MountService.java index 5fe1b277d205..5bf2a428fdb4 100644 --- a/services/java/com/android/server/MountService.java +++ b/services/java/com/android/server/MountService.java @@ -1968,7 +1968,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); diff --git a/tools/obbtool/mkobb.sh b/tools/obbtool/mkobb.sh index 1987696d0bb2..ba5256f77dd7 100755 --- a/tools/obbtool/mkobb.sh +++ b/tools/obbtool/mkobb.sh @@ -161,11 +161,10 @@ eval set -- "$args" while true; do \ case "$1" in - -c) use_crypto=1; shift;; -d) directory=$2; shift 2;; -h) usage; exit 1;; - -k) key=$2; shift 2;; - -K) prompt_key=1; shift;; + -k) key=$2; use_crypto=1; shift 2;; + -K) prompt_key=1; use_crypto=1; shift;; -v) verbose=1; shift;; -o) filename=$2; shift 2;; --) shift; break;; |