Robert Greenwalt
177cac90d0
am e55e5b84: am 3dba4353: Fix the build.
...
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
Fix the build.
2011-12-07 13:19:37 -08:00
Robert Greenwalt
86f079ec75
am 3dba4353: Fix the build.
...
* commit '3dba435361c8228652a4435cafcb2829bccf6199':
Fix the build.
2011-12-07 13:17:35 -08:00
Robert Greenwalt
3dba435361
Fix the build.
...
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
2011-12-07 13:10:59 -08:00
Robert Greenwalt
0b3d2a85b1
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:33:24 -08:00
Robert Greenwalt
f96257cbf4
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:31:35 -08:00
Robert Greenwalt
86a570287f
Trim leading zeros from ipv4 addrs.
...
Underlying libraries will interpret leading zeros as octal values and
fail.
bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
2011-12-07 09:58:48 -08:00
The Android Automerger
24faff2789
merge in ics-release history after reset to master
2011-11-28 12:24:50 -08:00
The Android Open Source Project
20ca0d4cf0
Reconcile with ics-mr0-release ics-mr1-release
...
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
2011-11-18 15:42:32 -08:00
The Android Automerger
bb86fff32f
merge in ics-release history after reset to master
2011-11-16 07:00:24 -08:00
Jeff Sharkey
ac0fb9c578
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
Jeff Sharkey
3f580616f4
am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
...
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
Conservatively trim data usage stats.
2011-11-15 09:25:40 -08:00
The Android Automerger
bf89045080
merge in ics-mr1-release history after reset to ics-mr1
2011-11-15 06:46:10 -08:00
Jeff Sharkey
6b0d72795f
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
355293867a
merge in ics-release history after reset to master
2011-11-13 07:00:59 -08:00
The Android Automerger
80db0d713a
merge in ics-mr1-release history after reset to ics-mr1
2011-11-13 06:46:51 -08:00
Robert Greenwalt
7217da5bf1
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
2011-11-11 11:51:55 -08:00
Robert Greenwalt
28e752f026
am 2c41bce3: am bc026d0a: Fix NPE in ConnectivityService.
...
* commit '2c41bce3f2134159ce64d589ff1bb298b9939178':
Fix NPE in ConnectivityService.
2011-11-11 11:51:16 -08:00
Robert Greenwalt
c55fb7c9bb
am bc026d0a: Fix NPE in ConnectivityService.
...
* commit 'bc026d0ad8457cf8a2cb66bd5ec06e11c035856f':
Fix NPE in ConnectivityService.
2011-11-11 11:50:34 -08:00
Robert Greenwalt
229b4494c7
am 7c9f8005: Merge "Fix Wimax-less build." into ics-mr1
...
* commit '7c9f8005e20af0bb741e36d8239f301371ba5f7f':
Fix Wimax-less build.
2011-11-11 11:49:45 -08:00
Robert Greenwalt
bc026d0ad8
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
2011-11-11 09:56:03 -08:00
Scott Main
27ea83f6f2
Merge "docs: some helpful javadocs for network info"
2011-11-11 09:49:23 -08:00
Akwasi Boateng
6cd46ce696
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
Robert Greenwalt
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
2011-11-10 17:35:49 -08:00
Robert Greenwalt
cafd8583a1
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
2011-11-10 17:14:05 -08:00
The Android Open Source Project
ad8c5483de
Reconcile with ics-mr1-release
...
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
2011-11-10 14:53:51 -08:00
The Android Automerger
1871a5be49
merge in ics-release history after reset to master
2011-11-10 07:00:36 -08:00
Jeff Sharkey
dbb59f22db
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
Robert Greenwalt
2511c7a555
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-09 19:34:50 +00:00
Jeff Sharkey
1a9c8fdf9c
am 4c48d2ff: Merge "Make operation counts monotonically increase." into ics-mr1
...
* commit '4c48d2ff6937e1e3a2fb93cc4cc29324b20542a5':
Make operation counts monotonically increase.
2011-11-09 18:59:38 +00:00
Robert Greenwalt
423307deb6
resolved conflicts for merge of ea54b760 to master
...
Change-Id: Ifcdfd6ffd82db1293936a8a3b5715dd767fb43f8
2011-11-09 09:03:59 -08:00
The Android Automerger
a21fdf9a37
merge in ics-mr1-release history after reset to ics-mr1
2011-11-09 06:47:03 -08:00
Jeff Sharkey
5255f307fb
Make operation counts monotonically increase.
...
Bug: 5585704
Change-Id: I5247a68acdb209a4ef0f5aac18944595c295e6ca
2011-11-08 17:35:28 -08:00
Robert Greenwalt
7ff9aa6b8f
am 604019c8: Merge "Fix build." into ics-mr1
...
* commit '604019c8d45b8c56cf48b03dbd92cfbdd29c48c1':
Fix build.
2011-11-08 18:33:20 +00:00
Robert Greenwalt
30e05e43e6
am ea54b760: Merge "Wimax : wimax framework related open source." into ics-mr1
...
* commit 'ea54b7608584bc0535c9e89417778c3e95b50975':
Wimax : wimax framework related open source.
2011-11-08 18:28:16 +00:00
Robert Greenwalt
e72c4aca58
Fix build.
...
Missed a commit that fixed some issues.
bug:5237167
Change-Id: I61e44831e2c3f1cf613ca1387aa95d712b7d2ded
2011-11-08 10:12:25 -08:00
The Android Automerger
bd415a36db
merge in ics-release history after reset to master
2011-11-08 06:53:51 -08:00
tk.mun
093f55ca9c
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
2011-11-07 14:47:40 -08:00
The Android Automerger
676e0a2db7
merge in ics-release history after reset to master
2011-11-06 07:00:26 -08:00
The Android Automerger
0f7eb3a300
merge in ics-mr1-release history after reset to ics-mr1
2011-11-06 06:46:10 -08:00
Robert Greenwalt
85112853e0
am 9dcad728: am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '9dcad728731206b3b41f07de65c706d9d4084124':
Start using IP tool for advanced routing.
2011-11-04 22:57:48 +00:00
Robert Greenwalt
9dcad72873
am 348297ab: Merge "Start using IP tool for advanced routing." into ics-mr0
...
* commit '348297abc0e03fb87a1d22465020b580d83fdd61':
Start using IP tool for advanced routing.
2011-11-04 22:55:30 +00:00
Robert Greenwalt
49c75d3db9
Start using IP tool for advanced routing.
...
bug:5495862
bug:5396842
Change-Id: I5e31b352b14a4dc746cacce4d61cf8d9ad7382a0
2011-11-04 09:52:04 -07:00
Doug Zongker
f30bfd16cc
Merge "store the hw addr in the extraInfo field of ethernet NetworkInfos" into ics-aah
2011-11-03 13:17:33 -07:00
Doug Zongker
947da0eb6d
store the hw addr in the extraInfo field of ethernet NetworkInfos
...
Change-Id: Ic645396e81d1481d84061945eb9721f0eeb151eb
2011-11-03 12:45:42 -07:00
The Android Automerger
c010bce778
merge in ics-release history after reset to master
2011-11-03 06:59:11 -07:00
The Android Automerger
3414200369
merge in ics-mr1-release history after reset to ics-mr1
2011-11-03 06:44:18 -07:00
Jeff Sharkey
e370a59bec
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
5358edb6d7
merge in ics-release history after reset to master
2011-10-30 07:00:19 -07:00
The Android Automerger
6e46141933
merge in ics-mr1-release history after reset to ics-mr1
2011-10-30 06:46:55 -07:00
Robert Greenwalt
274518a279
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
2011-10-27 14:50:27 -07:00