LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,165 Commits 2 Branches 0 Tags
fdad5b79a2db82cccd1edae7ec0933a61f8dde3c
Commit Graph

3165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Automerger
331c68201c merge in ics-mr1-release history after reset to ics-mr1 2012-01-12 14:01:29 -08:00
Robert Greenwalt
6ed1f684fd am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 
* commit '21eba066e5c50e20f9beb036336fa832c7a92509':
  Disable wimax when mobile data is in Settings
 2012-01-12 09:29:30 -08:00
Robert Greenwalt
21eba066e5 am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
 2012-01-12 09:26:48 -08:00
Robert Greenwalt
0364aa516c am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1 
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings
 2012-01-12 09:26:33 -08:00
tk.mun
5eee104218 Disable wimax when mobile data is in Settings 
- Add wimax related code in handleSetMobileData to disable wimax when Moblie data is disabled (Settings -> Wireless & Networks - More -> Mobile Networks ->Data Enabled)

Change-Id: Ibf2d9da2eb90d161128005f26ac4b3e991526af4
Signed-off-by: tk.mun <tk.mun@samsung.com>
 2012-01-06 10:32:54 -08:00
The Android Automerger
fcdea4f15f merge in ics-release history after reset to master 2012-01-05 07:00:08 -08:00
Robert Greenwalt
7fa3bdb746 Stop using shared DUN APN when tethering stops. 
Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using
a carrier-described APN when the tethering stops.

bug:5525764
Change-Id: I95ed2aaed4d79519d233a62cf2945edead8114bc
 2012-01-03 16:32:04 -08:00
Steve Block
1be767cf74 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
The Android Automerger
1c2255e427 merge in ics-release history after reset to master 2011-12-19 07:00:46 -08:00
Jeff Sharkey
bcd1e340c6 Restrict app data on metered networks. 
This separates the definition of "metered network" and "network with
limit."  For now, all mobile networks are considered metered.

Bug: 5571454
Change-Id: I394cd385bd33add75e53bfc9cf2fefd06a00208a
 2011-12-15 14:30:04 -08:00
The Android Automerger
5e6e511217 merge in ics-release history after reset to master 2011-12-12 07:00:26 -08:00
The Android Open Source Project
691bc744b0 am 54854d31: Reconcile with ics-mr0-release ics-mr1-release 
* commit '54854d311731b321e2bb2faec06bacb11d1fe07f':
  More fixing for issue #5366535: Lockscreen has wrong layout...
  DO NOT MERGE.  Integrate from MR 1 to fix issue #5366535: Lockscreen...
 2011-12-09 14:57:48 -08:00
The Android Automerger
cfdfbf9fe5 merge in ics-mr1-release history after reset to ics-mr1 2011-12-08 07:00:35 -08:00
The Android Automerger
626d529177 merge in ics-release history after reset to master 2011-12-08 07:00:15 -08:00
Robert Greenwalt
60660ab0f4 am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:12:47 -08:00
Robert Greenwalt
b54e7dc28d am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1 
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.
 2011-12-07 17:10:26 -08:00
Robert Greenwalt
549920a597 Fix NPE in trimV4AddrZeros. 
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
 2011-12-07 16:55:38 -08:00
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