Commit graph

4,287 commits

Message SHA1
Stop using shared DUN APN when tethering stops.
Backported from master, including a bug fix and a cdma enhancement.

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:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50

Robert Greenwalt   commited 2012-02-14 11:44:09 -08:00
59fa0278bb
merge in jb-release history after reset to master
The Android Automerger   commited 2012-02-13 09:00:16 -08:00
0b21f1b9ea
store the hw addr in the extraInfo field of ethernet NetworkInfos
Doug Zongker   authored and   Mike Lockwood   commited 2012-02-10 14:44:03 -08:00
b1a238dbb3
merge in jb-release history after reset to master
The Android Automerger   commited 2012-02-08 07:02:16 -08:00
6cf2573897
Send broadcast when changing restrict background.
When changing global restrict background status, send connectivity
change broadcast, since it radically changes DISCONNECTED/BLOCKED
status system-wide.

Also reduce verbose stats logging.

Bug: 5854466
Change-Id: I3b612c520f50cc3000a3a569b7e0ab5f691cc2bd

Jeff Sharkey   commited 2012-02-07 12:08:58 -08:00
b1b6ccd157
merge in jb-release history after reset to master
The Android Automerger   commited 2012-02-06 07:01:57 -08:00
72da21e678
Unify shorthand for byte-based units.
Change-Id: If990859dee3f0973e1d4c48f05312c84071b3328

Jeff Sharkey   commited 2012-02-03 14:50:13 -08:00
b3a842ef9c
merge in jb-release history after reset to master
The Android Automerger   commited 2012-02-02 07:01:41 -08:00
0532187967
Deprecate ACTION_BACKGROUND_DATA_SETTING_CHANGED.
Broadcast is no longer sent, except during first boot after platform
upgrade.

Change-Id: I7a9c105b5783ca9f9c3aca2efff6fe5c13a4c1fd

Jeff Sharkey   commited 2012-01-30 16:32:54 -08:00
c958c77f1a
merge in jb-release history after reset to master
The Android Automerger   commited 2012-01-25 16:11:00 -08:00
c4ec6419be
Merge "Add additional debug"
Wink Saville   authored and   Android (Google) Code Review   commited 2012-01-25 14:04:59 -08:00
678258626a
Add additional debug
When ConnectivityService#startUsingNetworkFeature is called and the
special network is not available output some additional information.

Change-Id: I34b226a208596fa6418f1f37a0feec1d274d493c

Wink Saville   commited 2012-01-25 13:47:54 -08:00
5030c0534f
merge in ics-release history after reset to master
The Android Automerger   commited 2012-01-25 07:00:17 -08:00
95ec30fedd
Move network stats to FileRotator pattern.
Split existing network stats into two separate classes: a recorder
which generates historical data based on periodic counter snapshots,
and a collection of historical data with persistance logic.

Recorder keeps a pending history in memory until outstanding data
crosses a specific threshold.  Persisting is handled through a given
FileRotator.  This pattern significantly reduces disk churn and
memory overhead.  Separate UID data from UID tag data, enabling a
shorter rotation cycle.  Migrate existing stats into new structure.

Remove "xt" stats until iptables hooks are ready.  Avoid consuming
Entry values when recording into NetworkStatsHistory.  Assign
operation counts to default route interface.

Introduce "Rewriter" interface in FileRotator with methods to enable
rewriteAll().  Introduce IndentingPrintWriter to handle indenting in
dump() methods.

Bug: 5386531
Change-Id: Ibe086230a17999a197206ca62d45f266225fdff1

Jeff Sharkey   commited 2012-01-24 11:13:14 -08:00
6298b780ae
merge in ics-release history after reset to master
The Android Automerger   commited 2012-01-23 07:00:41 -08:00
0d1f730720
am a1e87397: (-s ours) am f40f28e2: am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit 'a1e873975704814416ee4d5023bf0740ec195ec0':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Jean-Baptiste Queru   authored and   Android Git Automerger   commited 2012-01-20 16:30:21 -08:00
98b4bdbd7d
am c1cf0488: Reconcile with ics-mr1-release
* commit 'c1cf0488dc':

The Android Open Source Project   authored and   Android Git Automerger   commited 2012-01-20 15:52:27 -08:00
33789dd08c
Merge "Stop using shared DUN APN when tethering stops."
Robert Greenwalt   authored and   Android (Google) Code Review   commited 2012-01-20 14:35:41 -08:00
83b1fc9643
am ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit 'ba7f0d2a03643ce429421b81febf18fd50473070':
  Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)

Jean-Baptiste Queru   authored and   Android Git Automerger   commited 2012-01-19 17:25:58 -08:00
f40f28e2d2
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229

Steve Block   authored and   Jean-Baptiste Queru   commited 2012-01-19 14:44:50 -08:00
85a9820247
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b

The Android Open Source Project   commited 2012-01-19 13:06:50 -08:00
c1cf0488dc
merge in ics-release history after reset to master
The Android Automerger   commited 2012-01-12 14:13:18 -08:00
362273088c
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2012-01-12 14:01:29 -08:00
331c68201c
am 21eba066: am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '21eba066e5':
  Disable wimax when mobile data is in Settings

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-01-12 09:29:30 -08:00
6ed1f684fd
am 4b1261f1: Merge "Disable wimax when mobile data is in Settings" into ics-mr1
* commit '4b1261f17ae2a0180be09b1c987ec7e70b2b46a7':
  Disable wimax when mobile data is in Settings

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-01-12 09:26:48 -08:00
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

Robert Greenwalt   authored and   Android Git Automerger   commited 2012-01-12 09:26:33 -08:00
0364aa516c
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>

tk.mun   authored and   Robert Greenwalt   commited 2012-01-06 10:32:54 -08:00
5eee104218
merge in ics-release history after reset to master
The Android Automerger   commited 2012-01-05 07:00:08 -08:00
fcdea4f15f
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

Robert Greenwalt   commited 2012-01-03 16:32:04 -08:00
7fa3bdb746
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

Steve Block   commited 2012-01-03 22:38:27 +00:00
1be767cf74
merge in ics-release history after reset to master
The Android Automerger   commited 2011-12-19 07:00:46 -08:00
1c2255e427
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

Jeff Sharkey   commited 2011-12-15 14:30:04 -08:00
bcd1e340c6
merge in ics-release history after reset to master
The Android Automerger   commited 2011-12-12 07:00:26 -08:00
5e6e511217
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...

The Android Open Source Project   authored and   Android Git Automerger   commited 2011-12-09 14:57:48 -08:00
691bc744b0
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger   commited 2011-12-08 07:00:35 -08:00
cfdfbf9fe5
merge in ics-release history after reset to master
The Android Automerger   commited 2011-12-08 07:00:15 -08:00
626d529177
am 4741163c: am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit '4741163cd719ce88eddf17ebb0a3ffd6a8044fbe':
  Fix NPE in trimV4AddrZeros.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 17:12:47 -08:00
60660ab0f4
am fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit 'fbb09ea84f7a9df94358f05f4e680cb363bae663':
  Fix NPE in trimV4AddrZeros.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 17:10:26 -08:00
b54e7dc28d
Fix NPE in trimV4AddrZeros.
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3

Robert Greenwalt   commited 2011-12-07 16:55:38 -08:00
549920a597
am e55e5b84: am 3dba4353: Fix the build.
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
  Fix the build.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 13:19:37 -08:00
177cac90d0
am 3dba4353: Fix the build.
* commit '3dba435361':
  Fix the build.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 13:17:35 -08:00
86f079ec75
Fix the build.
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48

Robert Greenwalt   commited 2011-12-07 13:10:59 -08:00
3dba435361
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
  Trim leading zeros from ipv4 addrs.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 12:33:24 -08:00
0b3d2a85b1
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
  Trim leading zeros from ipv4 addrs.

Robert Greenwalt   authored and   Android Git Automerger   commited 2011-12-07 12:31:35 -08:00
f96257cbf4
Trim leading zeros from ipv4 addrs.
Underlying libraries will interpret leading zeros as octal values and
fail.

bug:5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c

Robert Greenwalt   commited 2011-12-07 09:58:48 -08:00
86a570287f
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-28 12:24:50 -08:00
24faff2789
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02

The Android Open Source Project   commited 2011-11-18 15:42:32 -08:00
20ca0d4cf0
merge in ics-release history after reset to master
The Android Automerger   commited 2011-11-16 07:00:24 -08:00
bb86fff32f
am bc03c74c: am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit 'bc03c74c485669695805944a655795a6f9890956':
  Conservatively trim data usage stats.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-11-15 11:30:34 -08:00
ac0fb9c578
am d968670d: Merge "Conservatively trim data usage stats." into ics-mr1
* commit 'd968670d8369e5d92ba9b7a45b3804d692a05a4e':
  Conservatively trim data usage stats.

Jeff Sharkey   authored and   Android Git Automerger   commited 2011-11-15 09:25:40 -08:00
3f580616f4