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

Commit 7cca3d35 authored Jun 10, 2020 by Kweku Adams Committed by Android (Google) Code Review Jun 10, 2020

Merge "Remove deprecated method."

parents 13fea226 75e3509c

api/removed.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,10 +61,6 @@ package android.app.slice {

	package android.app.usage {		package android.app.usage {

	public final class StorageStats implements android.os.Parcelable {
	method @Deprecated public long getCodeBytes();
	}

	public class StorageStatsManager {		public class StorageStatsManager {
	method @Deprecated public long getFreeBytes(String) throws java.io.IOException;		method @Deprecated public long getFreeBytes(String) throws java.io.IOException;
	method @Deprecated public long getTotalBytes(String) throws java.io.IOException;		method @Deprecated public long getTotalBytes(String) throws java.io.IOException;

core/java/android/app/usage/StorageStats.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -46,12 +46,6 @@ public final class StorageStats implements Parcelable {
	return codeBytes;		return codeBytes;
	}		}

	/** @removed */
	@Deprecated
	public long getCodeBytes() {
	return getAppBytes();
	}

	/**		/**
	* Return the size of all data. This includes files stored under		* Return the size of all data. This includes files stored under
	* {@link Context#getDataDir()}, {@link Context#getCacheDir()},		* {@link Context#getDataDir()}, {@link Context#getCacheDir()},

non-updatable-api/removed.txt

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -61,10 +61,6 @@ package android.app.slice {

	package android.app.usage {		package android.app.usage {

	public final class StorageStats implements android.os.Parcelable {
	method @Deprecated public long getCodeBytes();
	}

	public class StorageStatsManager {		public class StorageStatsManager {
	method @Deprecated public long getFreeBytes(String) throws java.io.IOException;		method @Deprecated public long getFreeBytes(String) throws java.io.IOException;
	method @Deprecated public long getTotalBytes(String) throws java.io.IOException;		method @Deprecated public long getTotalBytes(String) throws java.io.IOException;

packages/SettingsLib/src/com/android/settingslib/applications/ApplicationsState.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -532,7 +532,7 @@ public class ApplicationsState {
	mStats.getCacheQuotaBytes(		mStats.getCacheQuotaBytes(
	entry.info.storageUuid.toString(), entry.info.uid);		entry.info.storageUuid.toString(), entry.info.uid);
	final PackageStats legacy = new PackageStats(packageName, userId);		final PackageStats legacy = new PackageStats(packageName, userId);
	legacy.codeSize = stats.getCodeBytes();		legacy.codeSize = stats.getAppBytes();
	legacy.dataSize = stats.getDataBytes();		legacy.dataSize = stats.getDataBytes();
	legacy.cacheSize = Math.min(stats.getCacheBytes(), cacheQuota);		legacy.cacheSize = Math.min(stats.getCacheBytes(), cacheQuota);
	try {		try {
	@@ -1300,7 +1300,7 @@ public class ApplicationsState {
	final PackageStats legacy = new PackageStats(		final PackageStats legacy = new PackageStats(
	mCurComputingSizePkg,		mCurComputingSizePkg,
	mCurComputingSizeUserId);		mCurComputingSizeUserId);
	legacy.codeSize = stats.getCodeBytes();		legacy.codeSize = stats.getAppBytes();
	legacy.dataSize = stats.getDataBytes();		legacy.dataSize = stats.getDataBytes();
	legacy.cacheSize = stats.getCacheBytes();		legacy.cacheSize = stats.getCacheBytes();
	try {		try {

packages/SettingsLib/src/com/android/settingslib/applications/StorageStatsSource.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,7 @@ public class StorageStatsSource {
	}		}

	public long getCodeBytes() {		public long getCodeBytes() {
	return mStats.getCodeBytes();		return mStats.getAppBytes();
	}		}

	public long getDataBytes() {		public long getDataBytes() {