LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "[MS10.1] Move multiplySafeByRational to NetworkStatsUtils" am: 9105163c65 am: ea23644145 am: f0a8f35ba4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1920477

Change-Id: I6bff9f75d9426978d2d4077a3bc54d5c0cb0fe4a
This commit is contained in:
Junyu Lai
2021-12-21 01:51:06 +00:00
committed by Automerger Merge Worker
parent ef31581199 f0a8f35ba4
commit 0f63403caa
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework-t/src/android/net/NetworkStats.java
View File

@@ -16,7 +16,7 @@
package android.net;
import static com.android.internal.net.NetworkUtilsInternal.multiplySafeByRational;
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
import android.annotation.IntDef;
import android.annotation.NonNull;

2
framework-t/src/android/net/NetworkStatsCollection.java
View File

@@ -30,7 +30,7 @@ import static android.net.NetworkStats.UID_ALL;
import static android.net.TrafficStats.UID_REMOVED;
import static android.text.format.DateUtils.WEEK_IN_MILLIS;
import static com.android.internal.net.NetworkUtilsInternal.multiplySafeByRational;
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
import android.os.Binder;
import android.service.NetworkStatsCollectionKeyProto;

2
framework-t/src/android/net/NetworkStatsHistory.java
View File

@@ -28,8 +28,8 @@ import static android.net.NetworkStatsHistory.ParcelUtils.readLongArray;
import static android.net.NetworkStatsHistory.ParcelUtils.writeLongArray;
import static android.text.format.DateUtils.SECOND_IN_MILLIS;
import static com.android.internal.net.NetworkUtilsInternal.multiplySafeByRational;
import static com.android.internal.util.ArrayUtils.total;
import static com.android.net.module.util.NetworkStatsUtils.multiplySafeByRational;
import android.compat.annotation.UnsupportedAppUsage;
import android.os.Build;