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

am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev

Browse Source 
* commit 'c968e219372e140e2ae34f9b1e91597ccb719381':
  Determine if we have adoptable disks.
This commit is contained in:
Jeff Sharkey
2015-05-13 20:59:52 +00:00
committed by Android Git Automerger
parent c49bf0ae34 c968e21937
commit cddcdf8824
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmds/sm/src/com/android/commands/sm/Sm.java
View File

@@ -18,8 +18,10 @@ package com.android.commands.sm;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
import android.os.storage.DiskInfo;
import android.os.storage.IMountService;
import android.os.storage.StorageManager;
import android.os.storage.VolumeInfo;
import android.util.Log;
@@ -65,6 +67,8 @@ public final class Sm {
runListDisks();
} else if ("list-volumes".equals(op)) {
runListVolumes();
} else if ("has-adoptable".equals(op)) {
runHasAdoptable();
} else if ("get-primary-storage-uuid".equals(op)) {
runGetPrimaryStorageUuid();
} else if ("partition".equals(op)) {
@@ -111,7 +115,12 @@ public final class Sm {
}
}
public void runGetPrimaryStorageUuid() throws RemoteException{
public void runHasAdoptable() {
System.out.println(SystemProperties.getBoolean(StorageManager.PROP_HAS_ADOPTABLE, false)
|| SystemProperties.getBoolean(StorageManager.PROP_FORCE_ADOPTABLE, false));
}
public void runGetPrimaryStorageUuid() throws RemoteException {
System.out.println(mSm.getPrimaryStorageUuid());
}
@@ -166,6 +175,7 @@ public final class Sm {
private static int showUsage() {
System.err.println("usage: sm list-disks");
System.err.println(" sm list-volumes [public|private|emulated|all]");
System.err.println(" sm has-adoptable");
System.err.println(" sm get-primary-storage-uuid");
System.err.println("");
System.err.println(" sm partition DISK [public|private|mixed] [ratio]");

2
core/java/android/os/storage/StorageManager.java
View File

@@ -73,6 +73,8 @@ public class StorageManager {
/** {@hide} */
public static final String PROP_PRIMARY_PHYSICAL = "ro.vold.primary_physical";
/** {@hide} */
public static final String PROP_HAS_ADOPTABLE = "vold.has_adoptable";
/** {@hide} */
public static final String PROP_FORCE_ADOPTABLE = "persist.fw.force_adoptable";
/** {@hide} */