Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e40e67f authored by Kenny Root's avatar Kenny Root Committed by Android Git Automerger
Browse files

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

Merge commit 'd9e88d22' into gingerbread-plus-aosp

* commit 'd9e88d22':
  Add "none" for vold and deprecate mkobb -c
parents 007d5b2c d9e88d22

services/java/com/android/server/MountService.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

tools/obbtool/mkobb.sh

+2 −3
Original line number Diff line number Diff line
@@ -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;;