[MS49] Remove NetworkStats hidden Api usages
This includes: 1. Remove unused INetworkStatsService and NetworkStatsHistory. 2. Replace NetworkTemplate usages with builder. 3. Replace TrafficStats references to DataUnit. 4. Reimplement NetworkTemplate#normalize. Test: make RunSettingsRoboTests Bug: 204830222 (cherry-picked from ag/16724040) Change-Id: I8efecda5df403e9ed588daecd169cb3498d213a2 Merged-In: I8efecda5df403e9ed588daecd169cb3498d213a2
This commit is contained in:
@@ -26,10 +26,10 @@ import static org.mockito.Mockito.spy;
|
||||
import android.app.usage.NetworkStatsManager;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.net.TrafficStats;
|
||||
import android.provider.Settings;
|
||||
import android.telephony.SubscriptionManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.util.DataUnit;
|
||||
|
||||
import androidx.preference.SwitchPreference;
|
||||
|
||||
@@ -128,7 +128,7 @@ public class DataUsagePreferenceControllerTest {
|
||||
public void updateState_shouldUseIECUnit() {
|
||||
final DataUsageController.DataUsageInfo usageInfo =
|
||||
new DataUsageController.DataUsageInfo();
|
||||
usageInfo.usageLevel = TrafficStats.MB_IN_BYTES;
|
||||
usageInfo.usageLevel = DataUnit.MEBIBYTES.toBytes(1);
|
||||
doReturn(usageInfo).when(mController).getDataUsageInfo(any());
|
||||
|
||||
mController.updateState(mPreference);
|
||||
|
||||
Reference in New Issue
Block a user