Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revive Null check for backward compatibility." into mnc-dev

Browse Source
This commit is contained in:
Seigo Nonaka
2015-06-23 08:31:08 +00:00
committed by Android (Google) Code Review
parent 3ae5e8b25b 2ac124b790
commit 02ebcdb911
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/text/format/Formatter.java
View File

@@ -16,6 +16,7 @@
package android.text.format; package android.text.format;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.net.NetworkUtils; import android.net.NetworkUtils;
@@ -52,7 +53,10 @@ public final class Formatter {
* @param sizeBytes size value to be formatted, in bytes * @param sizeBytes size value to be formatted, in bytes
* @return formatted string with the number * @return formatted string with the number
*/ */
public static String formatFileSize(Context context, long sizeBytes) { public static String formatFileSize(@Nullable Context context, long sizeBytes) {
if (context == null) {
return "";
}
final BytesResult res = formatBytes(context.getResources(), sizeBytes, 0); final BytesResult res = formatBytes(context.getResources(), sizeBytes, 0);
return context.getString(com.android.internal.R.string.fileSizeSuffix, return context.getString(com.android.internal.R.string.fileSizeSuffix,
res.value, res.units); res.value, res.units);
@@ -62,7 +66,10 @@ public final class Formatter {
* Like {@link #formatFileSize}, but trying to generate shorter numbers * Like {@link #formatFileSize}, but trying to generate shorter numbers
* (showing fewer digits of precision). * (showing fewer digits of precision).
*/ */
public static String formatShortFileSize(Context context, long sizeBytes) { public static String formatShortFileSize(@Nullable Context context, long sizeBytes) {
if (context == null) {
return "";
}
final BytesResult res = formatBytes(context.getResources(), sizeBytes, FLAG_SHORTER); final BytesResult res = formatBytes(context.getResources(), sizeBytes, FLAG_SHORTER);
return context.getString(com.android.internal.R.string.fileSizeSuffix, return context.getString(com.android.internal.R.string.fileSizeSuffix,
res.value, res.units); res.value, res.units);