Merge \"Added a getPrimaryStorageSize() method.\" into nyc-mr1-dev (02e2d72d) · Commits · e / os / android_frameworks_base

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

+24 −0

Original line number	Diff line number	Diff line
		@@ -45,8 +45,11 @@ import android.util.SparseArray;
		import com.android.internal.os.SomeArgs;
		import com.android.internal.util.Preconditions;

		import java.io.BufferedReader;
		import java.io.File;
		import java.io.FileInputStream;
		import java.io.IOException;
		import java.io.InputStreamReader;
		import java.lang.ref.WeakReference;
		import java.util.ArrayList;
		import java.util.Arrays;
		@@ -115,6 +118,10 @@ public class StorageManager {
		public static final int FLAG_INCLUDE_INVISIBLE = 1 << 10;

		private static volatile IMountService sMountService = null;
		private static final String INTERNAL_STORAGE_SIZE_PATH =
		"/sys/block/mmcblk0/size";
		private static final String INTERNAL_STORAGE_SECTOR_SIZE =
		"/sys/block/mmcblk0/queue/hw_sector_size";

		private final Context mContext;
		private final ContentResolver mResolver;
		@@ -903,6 +910,23 @@ public class StorageManager {
		return getVolumeList(UserHandle.myUserId(), FLAG_REAL_STATE \| FLAG_INCLUDE_INVISIBLE)[0];
		}

		/** {@hide} */
		public long getPrimaryStorageSize() {
		final long numberBlocks = readLong(INTERNAL_STORAGE_SIZE_PATH);
		final long sectorSize = readLong(INTERNAL_STORAGE_SECTOR_SIZE);
		return numberBlocks * sectorSize;
		}

		private long readLong(String path) {
		try (final FileInputStream fis = new FileInputStream(path);
		final BufferedReader reader = new BufferedReader(new InputStreamReader(fis));) {
		return Long.parseLong(reader.readLine());
		} catch (Exception e) {
		Slog.w("Could not read " + path, e);
		return 0;
		}
		}

		/** @removed */
		public @NonNull StorageVolume[] getVolumeList() {
		return getVolumeList(mContext.getUserId(), 0);