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

Commit a6101e8b authored Mar 29, 2019 by Anton Hansson

Make data warning notification use IEC units

This makes the number presented to the user consistent between
Settings and the notification. Previously the notification used
SI units while Settings used IEC units.

I haven't tested the TYPE_LIMIT_SNOOZED notification as I'm not
sure how to trigger it (though I don't see any reason why it
wouldn't get the same treatment).

Bug: 91635986
Test: manually:
      1) set a limit for 10 MB
      2) use >10 MB of data
      3) verify notification and Settings agree on data use
Change-Id: I31f157332ac273ae260651eb426ab97258180176

parent ee10d8bc

core/java/android/text/format/Formatter.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -92,10 +92,15 @@ public final class Formatter {
		* @return formatted string with the number
		*/
		public static String formatFileSize(@Nullable Context context, long sizeBytes) {
		return formatFileSize(context, sizeBytes, FLAG_SI_UNITS);
		}

		/** @hide */
		public static String formatFileSize(@Nullable Context context, long sizeBytes, int flags) {
		if (context == null) {
		return "";
		}
		final BytesResult res = formatBytes(context.getResources(), sizeBytes, FLAG_SI_UNITS);
		final BytesResult res = formatBytes(context.getResources(), sizeBytes, flags);
		return bidiWrap(context, context.getString(com.android.internal.R.string.fileSizeSuffix,
		res.value, res.units));
		}

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1335,7 +1335,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		case TYPE_WARNING: {
		title = res.getText(R.string.data_usage_warning_title);
		body = res.getString(R.string.data_usage_warning_body,
		Formatter.formatFileSize(mContext, totalBytes));
		Formatter.formatFileSize(mContext, totalBytes, Formatter.FLAG_IEC_UNITS));

		builder.setSmallIcon(R.drawable.stat_notify_error);

		@@ -1383,7 +1383,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
		}
		final long overBytes = totalBytes - policy.limitBytes;
		body = res.getString(R.string.data_usage_limit_snoozed_body,
		Formatter.formatFileSize(mContext, overBytes));
		Formatter.formatFileSize(mContext, overBytes, Formatter.FLAG_IEC_UNITS));

		builder.setOngoing(true);
		builder.setSmallIcon(R.drawable.stat_notify_error);