Commit graph

4,287 commits

Message SHA1
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-11-15 06:46:10 -08:00
bf89045080
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

Jeff Sharkey   commited 2011-11-14 20:11:38 -08:00
6b0d72795f
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-13 07:00:59 -08:00
355293867a
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-11-13 06:46:51 -08:00
80db0d713a
Fix NPE in ConnectivityService.
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.

bug:5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e

Robert Greenwalt   authored and   The Android Automerger   commited 2011-11-11 11:51:55 -08:00
7217da5bf1
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService.
* commit '2c41bce3f2134159ce64d589ff1bb298b9939178':
  Fix NPE in ConnectivityService.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-11 11:51:16 -08:00
28e752f026
am bc026d0a: Fix NPE in ConnectivityService.
* commit 'bc026d0ad8':
  Fix NPE in ConnectivityService.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-11 11:50:34 -08:00
c55fb7c9bb
am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
  Fix Wimax-less build.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-11 11:49:45 -08:00
229b4494c7
Fix NPE in ConnectivityService.
If it's configured with a defined network but can't create a network state tracker
for it, it would NPE and restart the framework whenever a default network
disconnects.

bug:5603268
Change-Id: I816c4f522d766e0353a713623f6635b03395b01e

Robert Greenwalt   commited 2011-11-11 09:56:03 -08:00
bc026d0ad8
Merge "docs: some helpful javadocs for network info"
Scott Main   authored and   Android (Google) Code Review   commited 2011-11-11 09:49:23 -08:00
27ea83f6f2
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.

Akwasi Boateng   authored and   Android Git Automerger   commited 2011-11-11 15:34:19 +00:00
6cd46ce696
Fix Wimax-less build.
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.

bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54

Robert Greenwalt   authored and   The Android Automerger   commited 2011-11-10 17:35:49 -08:00
eba4e4ce7d
Fix Wimax-less build.
A build with the wimax network type defined but wimax disabled
causes an NPE in ConnectivityService's constructor.

bug:5237167
Change-Id: I929eac217e1afa0e61346fdbc3e96a7d3ad09a54

Robert Greenwalt   commited 2011-11-10 17:14:05 -08:00
cafd8583a1
Reconcile with ics-mr1-release
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e

The Android Open Source Project   commited 2011-11-10 14:53:51 -08:00
ad8c5483de
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-10 07:00:36 -08:00
1871a5be49
am 489b4312: am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '489b431273500db81d35ed43440915187c238f92':
  Make operation counts monotonically increase.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-11-09 21:51:38 +00:00
dbb59f22db
am 604019c8: Merge "Fix build." into ics-mr1
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-09 19:34:50 +00:00
2511c7a555
am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
  Make operation counts monotonically increase.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-11-09 18:59:38 +00:00
1a9c8fdf9c
resolved conflicts for merge of ea54b760 to master
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8

Robert Greenwalt   commited 2011-11-09 09:03:59 -08:00
423307deb6
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-11-09 06:47:03 -08:00
a21fdf9a37
Make operation counts monotonically increase.
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca

Jeff Sharkey   commited 2011-11-08 17:35:28 -08:00
5255f307fb
am 604019c8: Merge "Fix build." into ics-mr1
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
  Fix build.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-08 18:33:20 +00:00
7ff9aa6b8f
am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
  Wimax : wimax framework related open source.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-08 18:28:16 +00:00
30e05e43e6
Fix build.
Missed a commit that fixed some issues.
bug:5237167

Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded

Robert Greenwalt   commited 2011-11-08 10:12:25 -08:00
e72c4aca58
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-08 06:53:51 -08:00
bd415a36db
Wimax : wimax framework related open source.
Integrate wimax network related changes into Android Framework.
- In Connectivity service, start wimax service.
- 4G icon display in StatusBarPolicy.
- DHCP renew add.
- Add radio for wiamx

Change-Id: I2d9012247edfdf49d71ca7e1414afd0006f330ca
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5237167

tk.mun   authored and   Robert Greenwalt   commited 2011-11-07 14:47:40 -08:00
093f55ca9c
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-06 07:00:26 -08:00
676e0a2db7
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-11-06 06:46:10 -08:00
0f7eb3a300
am 9dcad728: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '9dcad72873':
  Start using IP tool for advanced routing.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-04 22:57:48 +00:00
85112853e0
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
  Start using IP tool for advanced routing.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-11-04 22:55:30 +00:00
9dcad72873
Start using IP tool for advanced routing.
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0

Robert Greenwalt   commited 2011-11-04 09:52:04 -07:00
49c75d3db9
Merge "store the hw addr in the extraInfo field of ethernet NetworkInfos" into ics-aah
Doug Zongker   authored and   Android (Google) Code Review   commited 2011-11-03 13:17:33 -07:00
f30bfd16cc
store the hw addr in the extraInfo field of ethernet NetworkInfos
Change-Id: Ic645396e81d1481d84061945eb9721f0eeb151eb

Doug Zongker   commited 2011-11-03 12:45:42 -07:00
947da0eb6d
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-03 06:59:11 -07:00
c010bce778
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-11-03 06:44:18 -07:00
3414200369
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

Jeff Sharkey   commited 2011-11-02 15:14:11 -07:00
e370a59bec
merge in ics-release history after reset to master
The Android Automerger   commited 2011-10-30 07:00:19 -07:00
5358edb6d7
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-10-30 06:46:55 -07:00
6e46141933
Temp disable Tethering if DUN is required
Getting source-based routing working is too risk for this point
in the project but tethering is broken otherwise, so disable
the tethering option if DUN is required until we can get a real
fix in.

bug:5495862
Change-Id: I5e852bf30c887599024a8b61af86ffec1d5333af

Robert Greenwalt   commited 2011-10-27 14:50:27 -07:00
274518a279
merge in ics-release history after reset to master
The Android Automerger   commited 2011-10-10 07:00:11 -07:00
566d8c4b49
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

Jeff Sharkey   commited 2011-10-09 13:49:08 -07:00
aac2c50385
merge in ics-release history after reset to master
The Android Automerger   commited 2011-10-09 07:00:35 -07:00
8cc55a22bc
docs: some helpful javadocs for network info
Change-Id: I8f1879bf10acd6371a76f11a8e5ec08643c3f943

Scott Main   commited 2011-10-06 19:26:48 -07:00
f58b7d82d0
docs: deprecate thingy
Change-Id: I579824680f3b5110d56981becaaf81f917989e7e

Scott Main   commited 2011-10-06 18:32:43 -07:00
5058914700
Merge "VPN: temporarily disable the default proxy when VPN is active."
Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-10-06 15:29:50 -07:00
ec49c91929
Merge "ConnectivityService: detach the logic of global proxy."
Chia-chi Yeh   authored and   Android (Google) Code Review   commited 2011-10-06 15:29:43 -07:00
f386f9ec7e
am a50d0f89: Merge "Hide quota APIs until finalized." into ics-factoryrom
* commit 'a50d0f8985d811a6a2f49aa65e31892048e96ccf':
  Hide quota APIs until finalized.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-10-06 11:22:40 -07:00
7aaf57609e
Hide quota APIs until finalized.
Bug: 5383656
Change-Id: Ia2a978a6ff2ee642b0ea4d7d6b8857b7efffd612

Jeff Sharkey   commited 2011-10-06 10:50:09 -07:00
eb3e8c66cb
merge in ics-release history after reset to master
The Android Automerger   commited 2011-10-05 06:58:56 -07:00
78c740e6c4
Read iface stats from single proc file.
When available, use single "iface_stat_all" file instead of reading
values from dozens of files scattered across proc.  Tests to verify.

Bug: 5397840
Change-Id: I0247be518436c1f79b32c4b72216739f49a9e8cc

Jeff Sharkey   commited 2011-10-04 13:22:39 -07:00
d49f1a59f9