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

Commit cddcdf88 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit 'c968e219':
  Determine if we have adoptable disks.
parents c49bf0ae c968e219

cmds/sm/src/com/android/commands/sm/Sm.java

+11 −1
Original line number Diff line number Diff line
@@ -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,6 +115,11 @@ public final class Sm { 
        }

    }



    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]");

core/java/android/os/storage/StorageManager.java

+2 −0
Original line number Diff line number Diff line
@@ -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} */