Merge "Add Log.wtf when getSummaryForAllUid NPEs."

This commit is contained in:
Jeff Davidson
2016-12-14 19:29:11 +00:00
committed by Android (Google) Code Review

View File

@@ -553,6 +553,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
@Override
public NetworkStats getSummaryForAllUid(
NetworkTemplate template, long start, long end, boolean includeTags) {
try {
@NetworkStatsAccess.Level int accessLevel = checkAccessLevel(mCallingPackage);
final NetworkStats stats =
getUidComplete().getSummary(template, start, end, accessLevel);
@@ -562,6 +563,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
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;
}
}
@Override