Merge "Add SDK sandbox network usage to corresponding apps." into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
63db54c290
@@ -20,6 +20,7 @@ import android.content.Context;
|
||||
import android.net.NetworkStats;
|
||||
import android.net.NetworkTemplate;
|
||||
import android.os.Bundle;
|
||||
import android.os.Process;
|
||||
import android.text.format.DateUtils;
|
||||
import android.text.format.Formatter;
|
||||
|
||||
@@ -91,11 +92,19 @@ public class AppDataUsagePreferenceController extends AppInfoPreferenceControlle
|
||||
@Override
|
||||
public Loader<List<NetworkCycleDataForUid>> onCreateLoader(int id, Bundle args) {
|
||||
final NetworkTemplate template = getTemplate(mContext);
|
||||
return NetworkCycleDataForUidLoader.builder(mContext)
|
||||
.addUid(mParent.getAppEntry().info.uid)
|
||||
.setRetrieveDetail(false)
|
||||
.setNetworkTemplate(template)
|
||||
.build();
|
||||
final int uid = mParent.getAppEntry().info.uid;
|
||||
|
||||
final NetworkCycleDataForUidLoader.Builder builder =
|
||||
NetworkCycleDataForUidLoader.builder(mContext);
|
||||
builder.setRetrieveDetail(false)
|
||||
.setNetworkTemplate(template);
|
||||
|
||||
builder.addUid(uid);
|
||||
if (Process.isApplicationUid(uid)) {
|
||||
// Also add in network usage for the app's SDK sandbox
|
||||
builder.addUid(Process.toSdkSandboxUid(uid));
|
||||
}
|
||||
return builder.build();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user