Merge "Expose StorageVolume.isStub() as @SystemApi API" (45450c2b) · Commits · e / os / android_frameworks_base

core/api/system-current.txt

+1 −0

Original line number	Diff line number	Diff line
		@@ -9202,6 +9202,7 @@ package android.os.storage {

		public final class StorageVolume implements android.os.Parcelable {
		method @NonNull public String getId();
		method public boolean isStub();
		}

		}

core/java/android/os/storage/StorageVolume.java

+20 −3

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ public final class StorageVolume implements Parcelable {
		@UnsupportedAppUsage
		private final boolean mRemovable;
		private final boolean mEmulated;
		private final boolean mStub;
		private final boolean mAllowMassStorage;
		private final long mMaxFileSize;
		private final UserHandle mOwner;
		@@ -137,8 +138,9 @@ public final class StorageVolume implements Parcelable {

		/** {@hide} */
		public StorageVolume(String id, File path, File internalPath, String description,
		boolean primary, boolean removable, boolean emulated, boolean allowMassStorage,
		long maxFileSize, UserHandle owner, UUID uuid, String fsUuid, String state) {
		boolean primary, boolean removable, boolean emulated, boolean stub,
		boolean allowMassStorage, long maxFileSize, UserHandle owner, UUID uuid, String fsUuid,
		String state) {
		mId = Preconditions.checkNotNull(id);
		mPath = Preconditions.checkNotNull(path);
		mInternalPath = Preconditions.checkNotNull(internalPath);
		@@ -146,6 +148,7 @@ public final class StorageVolume implements Parcelable {
		mPrimary = primary;
		mRemovable = removable;
		mEmulated = emulated;
		mStub = stub;
		mAllowMassStorage = allowMassStorage;
		mMaxFileSize = maxFileSize;
		mOwner = Preconditions.checkNotNull(owner);
		@@ -162,6 +165,7 @@ public final class StorageVolume implements Parcelable {
		mPrimary = in.readInt() != 0;
		mRemovable = in.readInt() != 0;
		mEmulated = in.readInt() != 0;
		mStub = in.readInt() != 0;
		mAllowMassStorage = in.readInt() != 0;
		mMaxFileSize = in.readLong();
		mOwner = in.readParcelable(null);
		@@ -264,12 +268,22 @@ public final class StorageVolume implements Parcelable {
		/**
		* Returns true if the volume is emulated.
		*
		* @return is removable
		* @return is emulated
		*/
		public boolean isEmulated() {
		return mEmulated;
		}

		/**
		* Returns true if the volume is a stub volume (a volume managed from outside Android).
		*
		* @hide
		*/
		@SystemApi
		public boolean isStub() {
		return mStub;
		}

		/**
		* Returns true if this volume can be shared via USB mass storage.
		*
		@@ -506,6 +520,7 @@ public final class StorageVolume implements Parcelable {
		pw.printPair("mPrimary", mPrimary);
		pw.printPair("mRemovable", mRemovable);
		pw.printPair("mEmulated", mEmulated);
		pw.printPair("mStub", mStub);
		pw.printPair("mAllowMassStorage", mAllowMassStorage);
		pw.printPair("mMaxFileSize", mMaxFileSize);
		pw.printPair("mOwner", mOwner);
		@@ -540,6 +555,7 @@ public final class StorageVolume implements Parcelable {
		parcel.writeInt(mPrimary ? 1 : 0);
		parcel.writeInt(mRemovable ? 1 : 0);
		parcel.writeInt(mEmulated ? 1 : 0);
		parcel.writeInt(mStub ? 1 : 0);
		parcel.writeInt(mAllowMassStorage ? 1 : 0);
		parcel.writeLong(mMaxFileSize);
		parcel.writeParcelable(mOwner, flags);
		@@ -621,6 +637,7 @@ public final class StorageVolume implements Parcelable {
		mPrimary,
		mRemovable,
		mEmulated,
		/* stub= */ false,
		/* allowMassStorage= */ false,
		/* maxFileSize= */ 0,
		mOwner,

core/java/android/os/storage/VolumeInfo.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -404,6 +404,7 @@ public class VolumeInfo implements Parcelable {

		final boolean removable;
		final boolean emulated;
		final boolean stub = type == TYPE_STUB;
		final boolean allowMassStorage = false;
		final String envState = reportUnmounted
		? Environment.MEDIA_UNMOUNTED : getEnvironmentForState(state);
		@@ -459,8 +460,8 @@ public class VolumeInfo implements Parcelable {
		}

		return new StorageVolume(id, userPath, internalPath, description, isPrimary(), removable,
		emulated, allowMassStorage, maxFileSize, new UserHandle(userId),
		uuid, derivedFsUuid, envState);
		emulated, stub, allowMassStorage, maxFileSize, new UserHandle(userId), uuid,
		derivedFsUuid, envState);
		}

		@UnsupportedAppUsage

core/java/android/os/storage/VolumeRecord.java

+3 −1

Original line number	Diff line number	Diff line
		@@ -105,6 +105,7 @@ public class VolumeRecord implements Parcelable {
		final boolean primary = false;
		final boolean removable = true;
		final boolean emulated = false;
		final boolean stub = false;
		final boolean allowMassStorage = false;
		final long maxFileSize = 0;
		final UserHandle user = new UserHandle(UserHandle.USER_NULL);
		@@ -116,7 +117,8 @@ public class VolumeRecord implements Parcelable {
		}

		return new StorageVolume(id, userPath, internalPath, description, primary, removable,
		emulated, allowMassStorage, maxFileSize, user, null /* uuid */, fsUuid, envState);
		emulated, stub, allowMassStorage, maxFileSize, user, null /* uuid */, fsUuid,
		envState);
		}

		public void dump(IndentingPrintWriter pw) {

media/tests/MtpTests/src/android/mtp/MtpDatabaseTest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ public class MtpDatabaseTest {

		StorageVolume mainStorage = new StorageVolume(MAIN_STORAGE_ID_STR,
		mMainStorageDir, mMainStorageDir, "Primary Storage",
		true, false, true, false, -1, UserHandle.CURRENT, null /* uuid */, "", "");
		true, false, true, false, false, -1, UserHandle.CURRENT, null /* uuid */, "", "");

		final StorageVolume primary = mainStorage;