Commit Graph

289 Commits

Author SHA1 Message Date
The Android Automerger
aef9d1ad9c merge in ics-mr1-release history after reset to ics-mr1 2011-11-22 11:56:20 -08:00
The Android Open Source Project
d7b6ee6a7f Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
2011-11-18 15:42:32 -08:00
Jeff Sharkey
47c8050fe3 am 7892cbff: am 8ac35e30: Merge "Only write network stats when already loaded." into ics-mr1
* commit '7892cbffbeffb6e73f4c88e9965064b3985971c2':
  Only write network stats when already loaded.
2011-11-17 15:12:45 -08:00
Jeff Sharkey
7047ec62ab Only write network stats when already loaded.
Bug: 5584564
Change-Id: Ife2a68804bf3691e9bccdc167807204bce8a85b2
2011-11-17 12:05:46 -08:00
Jeff Sharkey
92cf70de00 am 66b570c7: am b9df01d3: Merge "Update NTP outside locks, log large trim events." into ics-mr1
* commit '66b570c70471976cd2a99825898c778a7850f2c8':
  Update NTP outside locks, log large trim events.
2011-11-17 11:46:26 -08:00
The Android Automerger
a10168b2b8 merge in ics-mr1-release history after reset to ics-mr1 2011-11-17 06:46:36 -08:00
Jeff Sharkey
344b8bfa9e Update NTP outside locks, log large trim events.
Move NTP updates outside locks to avoid blocking ShutdownThread.  Add
logging around trim events that remove substantial history.  Include
history start in sample events.

Bug: 5627247, 5584564
Change-Id: If9bbd93842c710efcdec94e68da87e9e42a5f961
2011-11-16 17:58:47 -08:00
The Android Automerger
2f4bb4f3e4 merge in ics-release history after reset to master 2011-11-16 07:00:24 -08:00
Jeff Sharkey
72d8ddf710 am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.
2011-11-15 11:30:34 -08:00
The Android Automerger
a2e41671ad merge in ics-mr1-release history after reset to ics-mr1 2011-11-15 06:46:10 -08:00
Jeff Sharkey
ee0174da5e Conservatively trim data usage stats.
Instead of trusting NTP time alone, use the most-conservative of
system clock and NTP.

Bug: 5584564
Change-Id: I5dd87fc009959b1cf0a7d660e385a0b1a8be238b
2011-11-14 20:11:38 -08:00
The Android Automerger
20c2d0ca2f merge in ics-release history after reset to master 2011-11-13 07:00:59 -08:00
The Android Automerger
ddff1afb8f merge in ics-mr1-release history after reset to ics-mr1 2011-11-13 06:46:51 -08:00
Akwasi Boateng
ee62f59c0e am cb0db030: Merge branch \'ics-mr1-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-mr1-plus-aosp
* commit 'cb0db0306b5849a35d3d99eea1b34ce019c6f0d8':
  Make the overridden ImageView#setVisibility remotable
  Clamp non-monotonic stats instead of dropping.
  DO NOT MERGE. Fix leak in LayoutTransition
  Fix lastVisible/global rects
  Fix Wimax-less build.
  Fix leak in LayoutTransition
  Deferring wallpaper update to improve workspace scrolling (issue 5506959)
  Terminate EGL when an app goes in the background
  boot animation is dithered and scaled
  Fix NdefRecord byte-stream constructor.
  PopupWindow dismiss() can get into a recursive loop.
  Fold WiMAX state into the mobile RSSI.
  Remove dedicated wimax icon to fix RSSI layout.
2011-11-11 15:34:19 +00:00
Jeff Sharkey
42f4043633 Clamp non-monotonic stats instead of dropping.
When encountering non-monotonic stats rows, recover remaining data by
clamping to 0.  In particular, this avoids edge-case where persisting
threshold checks would never trigger.  Also recover when tethering
snapshots are missing.

Bug: 5600785, 5433871, 5600678
Change-Id: I1871954ce3955cc4ac8846f9841bae0066176ffe
2011-11-10 17:54:23 -08:00
The Android Open Source Project
85db52f901 Reconcile with ics-mr1-release
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
2011-11-10 14:53:51 -08:00
The Android Automerger
80e6f09cda merge in ics-release history after reset to master 2011-11-10 07:00:36 -08:00
Jeff Sharkey
c831ede3ac am 33e3710a: am 35226c4c: Merge "Bootstrap stats before registering listeners." into ics-mr1
* commit '33e3710aafb68125f05ab30d61e324c894f0a3bb':
  Bootstrap stats before registering listeners.
2011-11-09 21:51:40 +00:00
Jeff Sharkey
ef47cd1331 am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.
2011-11-09 21:51:38 +00:00
The Android Automerger
50fab4d508 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:47:03 -08:00
Jeff Sharkey
35226c4c27 Merge "Bootstrap stats before registering listeners." into ics-mr1 2011-11-08 23:43:58 -08:00
Jeff Sharkey
29f15bb4b3 Bootstrap stats before registering listeners.
Also move ISE to handled NonMonotonicException.

Bug: 5570872
Change-Id: I793f349287ef5589185f117dfbec6f1fad73a661
2011-11-08 18:24:12 -08:00
Jeff Sharkey
e2de8f08d4 Make operation counts monotonically increase.
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
The Android Automerger
67240b3dba merge in ics-release history after reset to master 2011-11-08 06:53:51 -08:00
The Android Automerger
42567048c8 merge in ics-release history after reset to master 2011-11-03 06:59:11 -07:00
The Android Automerger
77f0af6f1f merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:18 -07:00
Jeff Sharkey
cd5559a856 Correct proc file reader, optimizations.
Moved away from BufferedReader, which only reads the first 8KB of
some proc files because it aggresively fills its buffer.  Optimized
proc parsing, now double the speed.  Tests to cover.

Log when NetworkStats counters roll backwards when subtracting, and
optimizations around findIndex().  When system removes UID, also
remove from last stats snapshot to avoid xt counters from rolling
backwards.

Bug: 5472949, 5458380
Change-Id: I07c08fe5233156fac2b84450f6291868bf9bfaf2
2011-11-02 15:14:11 -07:00
The Android Automerger
dc3324602a merge in ics-mr1-release history after reset to ics-mr1 2011-11-02 06:46:08 -07:00
Robert Greenwalt
061658c2c7 Add cdma_rmnet4 to list of monitored interfaces
Lets the data traffic arrows work on LTE device on 1x,
but also lets telephony monitor for hung radios on 1X.

bug:5531630
Change-Id: I9fa25a5223afaa2e37373668c899ac28a95783fa
2011-11-01 11:51:27 -07:00
The Android Automerger
78e89a0cd8 merge in ics-release history after reset to master 2011-10-18 07:00:16 -07:00
Jeff Sharkey
92c7838ca3 Validate commands and arguments.
Bug: 5465176
Change-Id: I9402054c20ea6cae42781c35bfc2ade90aac31ce
2011-10-17 14:51:42 -07:00
The Android Automerger
29886072c9 merge in ics-release history after reset to master 2011-10-10 07:00:11 -07:00
Jeff Sharkey
27f58b3e26 Move battery stats to xt_qtaguid for data stats.
Replace TrafficStats calls by reading values from xt_qtaguid kernel
module. To keep BatteryStatsImpl changes lightweight, cache recently
parsed stats. Tracks mobile ifaces from ConnectivityService.

Refactor xt_qtaguid parsing into factory outside of NMS. Add stats
grouping based on UID, and total based on limiting filters like iface
prefix and UID.

Bug: 4902271
Change-Id: I533f116c434b77f93355bf95b839e7478528505b
2011-10-09 13:49:08 -07:00
The Android Automerger
ec60f276f4 merge in ics-release history after reset to master 2011-10-06 07:00:40 -07:00
Jeff Sharkey
0787a3616f Refine random stats generation.
Offer parameters to pick out specific list of packages, and to change
duration and total data.

Bug: 5416742
Change-Id: I6970a5e76f3198ef23a400c079037212b000ca6b
2011-10-05 23:31:57 -07:00
The Android Automerger
77622cdc0b merge in ics-release history after reset to master 2011-10-05 06:58:56 -07:00
Jeff Sharkey
f1369459ed Track xtables summary, move tether stats, time.
Begin tracking xtables summary of data usage to compare with values
reported from /proc/net/dev.  Roll tethering directly into UID stats
to trigger UID stats persisting when crossing threshold.

Include xtables summary and authoritative time in samples.

Bug: 5373561, 5397882, 5381980
Change-Id: Ib7945522caadfbe0864fdf391582dc820f4f371e
2011-10-03 17:21:05 -07:00
The Android Automerger
cc800bb2d2 merge in ics-release history after reset to master 2011-09-27 07:00:12 -07:00
Jeff Sharkey
8cddd4a5c7 Overlay to configure data usage network types.
Specify which network types should be counted when computing data
usage totals.

Bug: 5361005
Change-Id: I830caed1a29199892d209a692b50f8b3e144cafe
2011-09-26 10:50:30 -07:00
The Android Automerger
a3bcf5f03c merge in ics-release history after reset to master 2011-09-26 06:59:53 -07:00
Jeff Sharkey
6a2cbb63b3 Watch network subtype, tethering teardown, empty.
Watch for changes to telephony network subtype, and update iface
mapping to persist stats under correct type.  Update network stats
before removing tethering NAT rules.

Skip recording that would create empty historical buckets.  Query UID
stats before iface stats to always skew positive when counters are
actively rolling forward.

Bug: 5360042, 5359860, 5335674, 5334448
Change-Id: I8aa37b568e8ffb70647218aa1aff5195d3e44d5a
2011-09-22 16:19:06 -07:00
The Android Automerger
39fba68103 merge in ics-release history after reset to master 2011-09-22 07:00:05 -07:00
The Android Open Source Project
f7d44fa995 Reconcile with ics-factoryrom-release
Change-Id: I401a78a2216c8c4042f6f48b4e882035cbccfc82
2011-09-21 06:19:16 -07:00
The Android Automerger
97fb953b02 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 20:43:04 -07:00
The Android Automerger
9e76007b3d merge in ics-release history after reset to master 2011-09-20 07:00:19 -07:00
Jeff Sharkey
8d000c17f9 am 88b18eb8: Merge "Upload correct txPackets count." into ics-factoryrom
* commit '88b18eb8c2034e9de35482cc737ef8d608d55867':
  Upload correct txPackets count.
2011-09-19 21:44:00 -07:00
Jeff Sharkey
ed94a3c766 Upload correct txPackets count.
Bug: 5321340
Change-Id: Ie4dc7a91bf1cdc4d64c75ff09ae0cdd0fb141b5d
2011-09-19 18:37:11 -07:00
The Android Automerger
fac40c2576 merge in ics-release history after reset to master 2011-09-19 06:59:57 -07:00
Jeff Sharkey
8d8ecaef37 Sample atomic network stats buckets, full poll.
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
2011-09-18 16:27:21 -07:00
Jeff Sharkey
ffa6efd8e0 am aaf30173: (-s ours) Merge "DO NOT MERGE: Sample atomic network stats buckets, full poll." into ics-factoryrom
* commit 'aaf301736e923db15918617145069658696be453':
  DO NOT MERGE: Sample atomic network stats buckets, full poll.
2011-09-18 16:21:38 -07:00