Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0213bf1 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am f0bbc494: Merge "Avoid NPE when missing network stats." into ics-mr1 

* commit 'f0bbc494':
  Avoid NPE when missing network stats.
parents 3f69fad9 f0bbc494

services/java/com/android/server/net/NetworkStatsService.java

+4 −2
Original line number Diff line number Diff line
@@ -1060,8 +1060,10 @@ public class NetworkStatsService extends INetworkStatsService.Stub { 
        }



        // clear UID from current stats snapshot

        if (mLastPollUidSnapshot != null) {

            mLastPollUidSnapshot = mLastPollUidSnapshot.withoutUid(uid);

            mLastPollNetworkXtSnapshot = computeNetworkXtSnapshotFromUid(mLastPollUidSnapshot);

        }



        // clear kernel stats associated with UID

        resetKernelUidStats(uid);