Snap for 4531519 from b3c096d9b52acf8951d5ece7a9652cc43f31c722 to pi-release

Change-Id: I0c106285131fad47f9a2887c29d47fd5f42fc9ae
This commit is contained in:
android-build-team Robot
2018-01-08 08:24:46 +00:00

View File

@@ -27,6 +27,7 @@ import android.content.Context;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.util.DataUnit;
import com.android.server.NetworkManagementSocketTagger; import com.android.server.NetworkManagementSocketTagger;
@@ -56,15 +57,20 @@ public class TrafficStats {
*/ */
public final static int UNSUPPORTED = -1; public final static int UNSUPPORTED = -1;
/** @hide */ /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */
@Deprecated
public static final long KB_IN_BYTES = 1024; public static final long KB_IN_BYTES = 1024;
/** @hide */ /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */
@Deprecated
public static final long MB_IN_BYTES = KB_IN_BYTES * 1024; public static final long MB_IN_BYTES = KB_IN_BYTES * 1024;
/** @hide */ /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */
@Deprecated
public static final long GB_IN_BYTES = MB_IN_BYTES * 1024; public static final long GB_IN_BYTES = MB_IN_BYTES * 1024;
/** @hide */ /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */
@Deprecated
public static final long TB_IN_BYTES = GB_IN_BYTES * 1024; public static final long TB_IN_BYTES = GB_IN_BYTES * 1024;
/** @hide */ /** @hide @deprecated use {@link DataUnit} instead to clarify SI-vs-IEC */
@Deprecated
public static final long PB_IN_BYTES = TB_IN_BYTES * 1024; public static final long PB_IN_BYTES = TB_IN_BYTES * 1024;
/** /**