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

Merge "Add Log.wtf when getSummaryForAllUid NPEs."

Browse Source
This commit is contained in:
Jeff Davidson
2016-12-14 19:29:11 +00:00
committed by Android (Google) Code Review
parent 34af49bb01 ed23aa6ca4
commit 601bc9b9a7
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -553,15 +553,21 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override @Override
public NetworkStats getSummaryForAllUid( public NetworkStats getSummaryForAllUid(
NetworkTemplate template, long start, long end, boolean includeTags) { NetworkTemplate template, long start, long end, boolean includeTags) {
@NetworkStatsAccess.Level int accessLevel = checkAccessLevel(mCallingPackage); try {
final NetworkStats stats = @NetworkStatsAccess.Level int accessLevel = checkAccessLevel(mCallingPackage);
getUidComplete().getSummary(template, start, end, accessLevel); final NetworkStats stats =
if (includeTags) { getUidComplete().getSummary(template, start, end, accessLevel);
final NetworkStats tagStats = getUidTagComplete() if (includeTags) {
.getSummary(template, start, end, accessLevel); final NetworkStats tagStats = getUidTagComplete()
stats.combineAllValues(tagStats); .getSummary(template, start, end, accessLevel);
stats.combineAllValues(tagStats);
}
return stats;
} catch (NullPointerException e) {
// TODO: Track down and fix the cause of this crash and remove this catch block.
Slog.wtf(TAG, "NullPointerException in getSummaryForAllUid", e);
throw e;
} }
return stats;
} }
@Override @Override