diff options
| author | Kenny Root <kroot@google.com> | 2010-10-01 12:56:59 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2010-10-01 14:02:47 -0700 |
| commit | 12ffd9bf4c2cc9075ea7602b4932f823ba940f80 (patch) | |
| tree | 5799aa5df8bde6b1f641d704b8909d0549fd1784 | |
| parent | 2942391801b79816c5eb77d7ac94c4a65f26af48 (diff) | |
Add "none" for vold and deprecate mkobb -c
If vold isn't told "none" for the key, it will try to mount it as an
encrypted container.
Also remove the -c option from mkobb since it can be triggered by
including a key as well.
Change-Id: I40a8ff3f778bfda682312630e6687ecc14b51844
| -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 84998c34a753..8e5cdc2e8937 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;; |