diff options
author | Jeff Sharkey <jsharkey@google.com> | 2015-07-22 19:40:44 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-22 19:40:44 +0000 |
commit | f6e9a3ede53ae487838c19714ad62f25a4a6ca4c (patch) | |
tree | ddc88092c0d07f9d933d097a34e8312655b930e1 /cmds | |
parent | 4fc1b707442451f4a826929fc7e72967d443c73f (diff) | |
parent | 85ced632680642fce680d141ddd10299ff849233 (diff) | |
download | frameworks_base-f6e9a3ede53ae487838c19714ad62f25a4a6ca4c.zip frameworks_base-f6e9a3ede53ae487838c19714ad62f25a4a6ca4c.tar.gz frameworks_base-f6e9a3ede53ae487838c19714ad62f25a4a6ca4c.tar.bz2 |
Merge "More info to support CTS, fix reconcile bug." into mnc-dev
Diffstat (limited to 'cmds')
-rw-r--r-- | cmds/sm/src/com/android/commands/sm/Sm.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/cmds/sm/src/com/android/commands/sm/Sm.java b/cmds/sm/src/com/android/commands/sm/Sm.java index 0dad4dc..0a1ba4d 100644 --- a/cmds/sm/src/com/android/commands/sm/Sm.java +++ b/cmds/sm/src/com/android/commands/sm/Sm.java @@ -81,6 +81,8 @@ public final class Sm { runUnmount(); } else if ("format".equals(op)) { runFormat(); + } else if ("benchmark".equals(op)) { + runBenchmark(); } else if ("forget".equals(op)) { runForget(); } else { @@ -89,9 +91,12 @@ public final class Sm { } public void runListDisks() throws RemoteException { + final boolean onlyAdoptable = "adoptable".equals(nextArg()); final DiskInfo[] disks = mSm.getDisks(); for (DiskInfo disk : disks) { - System.out.println(disk.getId()); + if (!onlyAdoptable || disk.isAdoptable()) { + System.out.println(disk.getId()); + } } } @@ -161,6 +166,11 @@ public final class Sm { mSm.format(volId); } + public void runBenchmark() throws RemoteException { + final String volId = nextArg(); + mSm.benchmark(volId); + } + public void runForget() throws RemoteException{ final String fsUuid = nextArg(); if ("all".equals(fsUuid)) { @@ -180,7 +190,7 @@ public final class Sm { } private static int showUsage() { - System.err.println("usage: sm list-disks"); + System.err.println("usage: sm list-disks [adoptable]"); System.err.println(" sm list-volumes [public|private|emulated|all]"); System.err.println(" sm has-adoptable"); System.err.println(" sm get-primary-storage-uuid"); @@ -190,6 +200,7 @@ public final class Sm { System.err.println(" sm mount VOLUME"); System.err.println(" sm unmount VOLUME"); System.err.println(" sm format VOLUME"); + System.err.println(" sm benchmark VOLUME"); System.err.println(""); System.err.println(" sm forget [UUID|all]"); System.err.println(""); |