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

Merge "Add "none" for vold and deprecate mkobb -c" into gingerbread

Browse Source
This commit is contained in:
Kenny Root
2010-10-01 14:06:46 -07:00
committed by Android (Google) Code Review
parent fd57416cc8 12ffd9bf4c
commit d9e88d22f0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/java/com/android/server/MountService.java
View File

@@ -1968,7 +1968,8 @@ class MountService extends IMountService.Stub
} }
rc = StorageResultCode.OperationSucceeded; 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); mObbState.callerUid);
try { try {
mConnector.doCommand(cmd); mConnector.doCommand(cmd);

5
tools/obbtool/mkobb.sh
View File

@@ -161,11 +161,10 @@ eval set -- "$args"
while true; do \ while true; do \
case "$1" in case "$1" in
-c) use_crypto=1; shift;;
-d) directory=$2; shift 2;; -d) directory=$2; shift 2;;
-h) usage; exit 1;; -h) usage; exit 1;;
-k) key=$2; shift 2;; -k) key=$2; use_crypto=1; shift 2;;
-K) prompt_key=1; shift;; -K) prompt_key=1; use_crypto=1; shift;;
-v) verbose=1; shift;; -v) verbose=1; shift;;
-o) filename=$2; shift 2;; -o) filename=$2; shift 2;;
--) shift; break;; --) shift; break;;