Merge "Adjust hasAdoptable() based on debug flags." (f448e212) · Commits · e / os / android_frameworks_base

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

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1580,8 +1580,15 @@ public class StorageManager {

	/** {@hide} */		/** {@hide} */
	public static boolean hasAdoptable() {		public static boolean hasAdoptable() {
			switch (SystemProperties.get(PROP_ADOPTABLE)) {
			case "force_on":
			return true;
			case "force_off":
			return false;
			default:
	return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);		return SystemProperties.getBoolean(PROP_HAS_ADOPTABLE, false);
	}		}
			}

	/**		/**
	* Return if the currently booted device has the "isolated storage" feature		* Return if the currently booted device has the "isolated storage" feature