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

Merge "[MS48.5]Remove INetworkStatsSession from SummaryForAllUidLoader" am: 2c1d4eec79

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

Change-Id: I2fa85e7ec6dceceef2dd60216bc17c15cda259a2
This commit is contained in:
Frank Li
2022-01-27 09:01:14 +00:00
committed by Automerger Merge Worker
parent 959a2cdef3 2c1d4eec79
commit af700e251f
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SettingsLib/src/com/android/settingslib/net/SummaryForAllUidLoader.java
View File

@@ -16,13 +16,12 @@
package com.android.settingslib.net; package com.android.settingslib.net;
import android.app.usage.NetworkStats;
import android.app.usage.NetworkStatsManager;
import android.content.AsyncTaskLoader; import android.content.AsyncTaskLoader;
import android.content.Context; import android.content.Context;
import android.net.INetworkStatsSession;
import android.net.NetworkStats;
import android.net.NetworkTemplate; import android.net.NetworkTemplate;
import android.os.Bundle; import android.os.Bundle;
import android.os.RemoteException;
/** /**
* Framework loader is deprecated, use the compat version instead. * Framework loader is deprecated, use the compat version instead.
@@ -35,7 +34,7 @@ public class SummaryForAllUidLoader extends AsyncTaskLoader<NetworkStats> {
private static final String KEY_START = "start"; private static final String KEY_START = "start";
private static final String KEY_END = "end"; private static final String KEY_END = "end";
private final INetworkStatsSession mSession; private final NetworkStatsManager mNetworkStatsManager;
private final Bundle mArgs; private final Bundle mArgs;
public static Bundle buildArgs(NetworkTemplate template, long start, long end) { public static Bundle buildArgs(NetworkTemplate template, long start, long end) {
@@ -46,9 +45,9 @@ public class SummaryForAllUidLoader extends AsyncTaskLoader<NetworkStats> {
return args; return args;
} }
public SummaryForAllUidLoader(Context context, INetworkStatsSession session, Bundle args) { public SummaryForAllUidLoader(Context context, Bundle args) {
super(context); super(context);
mSession = session; mNetworkStatsManager = context.getSystemService(NetworkStatsManager.class);
mArgs = args; mArgs = args;
} }
@@ -63,12 +62,7 @@ public class SummaryForAllUidLoader extends AsyncTaskLoader<NetworkStats> {
final NetworkTemplate template = mArgs.getParcelable(KEY_TEMPLATE); final NetworkTemplate template = mArgs.getParcelable(KEY_TEMPLATE);
final long start = mArgs.getLong(KEY_START); final long start = mArgs.getLong(KEY_START);
final long end = mArgs.getLong(KEY_END); final long end = mArgs.getLong(KEY_END);
return mNetworkStatsManager.querySummary(template, start, end);
try {
return mSession.getSummaryForAllUid(template, start, end, false);
} catch (RemoteException e) {
return null;
}
} }
@Override @Override