Commit Graph

413 Commits

Author SHA1 Message Date
Jeff Sharkey
39fb9cd9c2 Update TrafficStats docs to reflect behavior.
Bug: 8399623
Change-Id: If9ccd305e8a077f318a09ac1bb160b8efbf903aa
2013-03-26 13:46:09 -07:00
JP Abgrall
7de8125565 jni: net.TrafficStats: fix getIfaceStat, have it use the iface.
Missing iface8 in call to parseIfaceStats().

Bug: 8304054
Change-Id: Ibb01d86a0f7241cdd8f23401973840673f847efb
2013-03-04 18:53:07 +00:00
Dianne Hackborn
e3cbff53a4 Merge "Add version code constant for JB MR2." into jb-mr2-dev 2013-02-25 23:56:38 +00:00
Dianne Hackborn
e9d7207f86 Add version code constant for JB MR2.
Change-Id: I60fc76bbeb3c5e85d716179e9e3ea5758bafaf69
2013-02-25 15:55:37 -08:00
Jeff Sharkey
26c10de1b7 Require command and argument separation, cleanup.
When invoking NativeDaemonCommands, require that base command and
arguments are separate.  Clean up reverse tethering commands, and
remove deprecated throttle events.

Change-Id: I302a74130b4f7c3f3045815a56d566e89c8969f6
2013-02-25 11:02:50 -08:00
Jeff Sharkey
6d9c71ab65 Remove sscanf() warnings when parsing stats.
Change-Id: I15b7ba93d7ec121f9a7e19926f7436f2117b3b1a
2013-02-13 18:13:01 -08:00
Jeff Sharkey
51c819c4ea Parse network stats using native code.
Switch to parsing detailed network stats with native code, which
is 71% faster than ProcFileReader.

Change-Id: I2525aaee74d227ce187ba3a74dd08a2b06514deb
2013-02-13 17:40:49 -08:00
Jeff Sharkey
805bdac0a0 Use safe buffer sizes when parsing network stats.
Change-Id: I1733c1ddc48f9410136aee7af7889fdc7be8cc10
2013-02-07 15:02:55 -08:00
Jeff Sharkey
5fee2c9ee2 Improve TrafficStats UID APIs.
Deprecate transport layer statistics, leaving only the summarized
network layer statistics.

Improve documentation to be clear about layers where measurements
occur, and their behavior since boot.  Under the hood, move to using
xt_qtaguid UID statistics.

Bug: 6818637, 7013662
Change-Id: I9f26992e5fcdebd88c671e5765bd91229e7b0016
2013-02-07 13:59:26 -08:00
Jeff Sharkey
9e766ac165 Offer parsed TCP interface statistics.
Also switch to newer iface_stat_fmt numbers, which are measured at
XT level instead of dev.

Bug: 7903145, 6569689
Change-Id: Ibeb742966b8c89916ea31a49388a5dbe25a5f67f
2013-02-06 16:23:12 -08:00
Irfan Sheriff
7ea4797b4f am 26aad112: am 97e4518e: Merge "NsdService: Clear client info after resolution request is serviced."
* commit '26aad1128726b2bea374b52f826831d117815025':
  NsdService: Clear client info after resolution request is serviced.
2012-12-28 09:47:03 -08:00
Irfan Sheriff
26aad11287 am 97e4518e: Merge "NsdService: Clear client info after resolution request is serviced."
* commit '97e4518ef8cad0cbbb8d3ea78615098c26b6a0de':
  NsdService: Clear client info after resolution request is serviced.
2012-12-21 10:07:24 -08:00
Irfan Sheriff
97e4518ef8 Merge "NsdService: Clear client info after resolution request is serviced." 2012-12-20 14:43:17 -08:00
Jeff Sharkey
86230aca66 Fix metered SSID matching regression.
WifiInfo changed to return SSIDs with quotes included, so relax our
identity matching to accept matches regardless of quotedness.

Bug: 7695807
Change-Id: Ib5d06666035e06b2d4b2f7cb498767d63b1b1828
2012-12-18 17:07:01 -08:00
Robert Greenwalt
bded8b7b0d am 378bdacc: am b30a24c4: Merge "return value of String.replace() is ignored."
* commit '378bdaccbb79ee11662725a18355dda64690f416':
  return value of String.replace() is ignored.
2012-12-11 16:54:33 -08:00
Robert Greenwalt
378bdaccbb am b30a24c4: Merge "return value of String.replace() is ignored."
* commit 'b30a24c4db8d2ed5f3ecfda0f6197fa974ae56d7':
  return value of String.replace() is ignored.
2012-12-11 16:52:39 -08:00
Robert Greenwalt
b30a24c4db Merge "return value of String.replace() is ignored." 2012-12-11 16:34:35 -08:00
The Android Open Source Project
5c610497a8 am b04fea02: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'b04fea024358435114427d53ef2bbff7cf07db7c':
2012-12-03 16:41:16 -08:00
The Android Open Source Project
b04fea0243 Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3fbcd93e4cef710bf1562bc7844f4a62f3146e02
2012-12-03 16:39:07 -08:00
The Android Automerger
d7633bb0ad merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-03 15:54:28 -08:00
Jeff Sharkey
f057fea5b9 am bf76d97d: am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
* commit 'bf76d97d78b0e89eb524c472c15aa249ab4c1c26':
  Avoid null mobile interfaces.
2012-12-03 11:42:50 -08:00
Jeff Sharkey
bf76d97d78 am 1f8f2839: am ed3fba65: Merge "Avoid null mobile interfaces." into jb-mr1.1-dev
* commit '1f8f283975c7cf51081acd3ea494de2b5f431607':
  Avoid null mobile interfaces.
2012-12-03 11:40:23 -08:00
Jeff Sharkey
17ffba9700 Avoid null mobile interfaces.
Bug: 7634215
Change-Id: I6745f6a78c07ba11d98b4562a6b53386112ef652
2012-11-30 17:49:39 -08:00
The Android Open Source Project
6d155a4181 am 14418170: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '14418170ff49169130b05e51ac923206de0568e1':
  trigger kernel blocked stack trace on system server watchdog
2012-11-29 15:47:09 -08:00
The Android Open Source Project
14418170ff Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ib7a3e7b3af9ef848b763cf498c6757ad5658fc80
2012-11-29 15:41:04 -08:00
Kenny Root
ebdcabef44 am 49e27d5f: am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"
* commit '49e27d5f9d77316350be6a119bad717d38ce5d95':
  Move NTP updates outside locks
2012-11-27 18:42:45 -08:00
Kenny Root
49e27d5f9d am ae0edeb3: am c88047bf: Merge "Move NTP updates outside locks"
* commit 'ae0edeb3e56c6aae113f8c5eaa3a03b79c00a93e':
  Move NTP updates outside locks
2012-11-27 13:00:01 -08:00
The Android Automerger
c8c2da1d00 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-16 11:29:29 -08:00
Jeff Sharkey
45dfdd6bc8 am 624a1eec: am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
* commit '624a1eec46b507067e31f3d6979bb3758c8b65e1':
  Useful annotations for code documentation.
2012-11-16 10:37:59 -08:00
Anders 3 Fridlund
0e851c78e3 Move NTP updates outside locks
When the ServerThread handles ACTION_SHUTDOWN intent it sometimes get
stuck on mStatsLock in NetworkStatsService.java.
0  com.android.server.net.NetworkStatsService$5.onReceive()
1  android.app.LoadedApk$ReceiverDispatcher$Args.run()
2  android.os.Handler.handleCallback()
3  android.os.Handler.dispatchMessage()
4  android.os.Looper.loop()
5  com.android.server.ServerThread.run()
This happens when the NetworkStats thread is already holding the
mStatsLock while updating NTP.
0  libcore.io.Posix.getaddrinfo()
1  libcore.io.ForwardingOs.getaddrinfo()
2  java.net.InetAddress.lookupHostByName()
3  java.net.InetAddress.getAllByNameImpl()
4  java.net.InetAddress.getByName()
5  android.net.SntpClient.requestTime()
6  android.util.NtpTrustedTime.forceRefresh()
7  com.android.server.net.NetworkStatsService.performPoll()
8  com.android.server.net.NetworkStatsService.access$100()
9  com.android.server.net.NetworkStatsService$2.onReceive()
10 android.app.LoadedApk$ReceiverDispatcher$Args.run()
11 android.os.Handler.handleCallback()
12 android.os.Handler.dispatchMessage()
13 android.os.Looper.loop()
14 android.os.HandlerThread.run()
Since the NTP update consists of several socket operations it may get
stuck long enough to trigger a System Server Watchdog even though the
socket timeout is set to 20 second.
Further, the NTP update doesn't actually need to be performed inside
the locks and an attempt to change this was made earlier, but the code
wasn't actually moved outside the locks.

Change-Id: Ib37a2b8c2d51a01adb7ff01764f82309433703f0
2012-11-16 13:28:29 +01:00
Jeff Sharkey
624a1eec46 am bfea4f04: am f5377a72: Merge "Useful annotations for code documentation." into jb-mr1.1-dev
* commit 'bfea4f04f226f1adf374412628d5945c380382a7':
  Useful annotations for code documentation.
2012-11-15 11:56:19 -08:00
The Android Open Source Project
80fd441ee9 am 3e8ca675: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '3e8ca6759e6a3cde0c72bb9d1830cef8f77d5485':
2012-11-14 12:42:57 -08:00
The Android Open Source Project
3e8ca6759e Reconcile with jb-mr1.1-release - do not merge
Change-Id: I8bc0bebd74908751627e9e8e4100111b39e48710
2012-11-14 12:40:58 -08:00
The Android Automerger
29e0ddac72 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-14 11:28:16 -08:00
Jeff Sharkey
526438dbe6 Useful annotations for code documentation.
Bug: 6537978
Change-Id: I806c3c09e3255f8789455f13bf37c1dde2a93f1f
2012-11-12 12:42:17 -08:00
The Android Open Source Project
a9be4f522d am cd3eb048: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit 'cd3eb048ced78a5790bc8626842a6b82c8db7812':
2012-11-06 12:40:19 -08:00
The Android Open Source Project
cd3eb048ce Reconcile with jb-mr1.1-release - do not merge
Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e
2012-11-06 12:37:23 -08:00
The Android Open Source Project
57f1ab2a25 am bb83b1c3: (-s ours) am 32477a8d: am 8d5f8e2b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'bb83b1c34519b1598fef6ea3e750ea3e3dd51e18':
2012-11-06 12:31:22 -08:00
The Android Open Source Project
bb83b1c345 am 32477a8d: am 8d5f8e2b: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '32477a8dbf812795a19529d52c4ec2e079989cef':
2012-11-06 12:26:57 -08:00
The Android Open Source Project
8d5f8e2b7b Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
2012-11-06 12:17:05 -08:00
The Android Automerger
9f62b71346 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:30 -08:00
The Android Open Source Project
15ae30af72 am 5adafd52: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '5adafd52a0b5db71010e6d108e83214bce0af2c4':
2012-11-05 14:23:43 -08:00
The Android Open Source Project
5adafd52a0 Reconcile with jb-mr1-release - do not merge
Change-Id: Ib9f5712e4d1a5e0f0b4807cffda4769196c64c21
2012-11-05 14:21:22 -08:00
The Android Automerger
d81cd2fe45 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-02 17:34:34 -07:00
Jeff Sharkey
693779e4e9 am a49ee229: am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit 'a49ee229138192aff86676da1d511cf4753ddba2':
  Sanity check network stats coming from disk.
2012-11-02 15:57:53 -07:00
Jeff Sharkey
a49ee22913 am 35d0dea3: am 1c743650: Merge "Sanity check network stats coming from disk." into jb-mr1-dev
* commit '35d0dea38bad69082f4153d9c335061a70fac4fc':
  Sanity check network stats coming from disk.
2012-11-02 15:54:50 -07:00
Jeff Sharkey
3a8abe7eec Sanity check network stats coming from disk.
Throw early when structure is unstable, which allows the normal
recoverFromWtf() path to recover automatically.

Bug: 7440485
Change-Id: Ic150d17daac4de7c9ff3489025403a9b485b4620
2012-11-02 15:38:15 -07:00
You Kim
0f1fea45d3 return value of String.replace() is ignored.
Change-Id: Id7330e1ffc9f429b22f153d8e644fa7c64354173
Signed-off-by: You Kim <you.kim72@gmail.com>
2012-10-28 23:57:57 +09:00
The Android Open Source Project
c651829236 am 477bc569: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '477bc569ccf5c4ed1a8910e9c07e08738e7f7eae':
  Fix bug #7259242 text is left justified with no padding
  DO NOT MERGE - Revert fixes for ImageView/MeasureSpec/RelativeLayout
  Quick reject empty paths
  Fix bug #7259242 text is left justified with no padding
  MediaRouter/Wifi Display improvements
  Status bar: Keep disabled state per user.
  ScaleGestureDetector does the safety dance.
  Adding missing file in previous change (Bug 7252771)
  Add wireless display selection support to MediaRouter.
  Fixing crash in QuickContacts. (Bug 7252771)
  temporarily disable blacklisting
  Revert "Do not use last app rotation as default."
  Revert "Fix adjustViewBounds handling for ImageView"
  Global gesture to toggle Accessibility system-wide.
  Fix perf regression from scale/density mismatch
  Plug memory leak that happens when reusing display lists Bug #7195815
  Don't use the QCOM_tiled_rendering extension with functors Bug #7247880
2012-10-02 09:21:24 -07:00
The Android Open Source Project
477bc569cc Reconcile with jb-mr1-release - do not merge
Change-Id: Ic7d71f0ada5470023de4dafc45024145d4d21a5b
2012-10-02 09:18:17 -07:00