Commit Graph

14477 Commits

Author SHA1 Message Date
Iliyan Malchev
dc679a6507 am 87abf00d: Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev
* commit '87abf00d2fe3cfe14cbcb7e6bfa9d60e340efc5b':
  Revert "Revert "CTS for timestamp in ScanResult""
2012-08-20 14:59:46 -07:00
Iliyan Malchev
87abf00d2f Merge "Revert "Revert "CTS for timestamp in ScanResult""" into jb-mr1-dev 2012-08-20 14:58:31 -07:00
Iliyan Malchev
f1537c2ba4 Revert "Revert "CTS for timestamp in ScanResult""
With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 72010dbfcf

Change-Id: I1066567c728b233ad1d6c6af912c32ef099580e6
2012-08-20 13:21:49 -07:00
Robert Greenwalt
4e235f7eb7 am bb1d9847: am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev
* commit 'bb1d98473c737bff05e3ae11d8ec53195e04725a':
  Update TCP buffer size when switching network type
2012-08-20 12:57:28 -07:00
Robert Greenwalt
f90d00e593 Update TCP buffer size when switching network type
Import of non-merging change 41612 from AOSP

When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Ic44a557677ffe629e83ce1f522a9f058bee6e7b2
2012-08-20 12:28:51 -07:00
Robert Greenwalt
f021438b03 am 634f34af: am a819a078: am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '634f34af410ee181ef104260b2f31a87562eb4e0':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:49:52 -07:00
Robert Greenwalt
a819a0786b am 89ab6757: (-s ours) am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '89ab67578e4e06c41f0e96d840de952d10895233':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:44:54 -07:00
Robert Greenwalt
89ab67578e am 6626398a: Merge "Fix for updating TCP buffer size when switching network type"
* commit '6626398a72ae592e3a9184c9b0868df0fc1f1724':
  Fix for updating TCP buffer size when switching network type
2012-08-17 13:28:25 -07:00
Magnus Strandberg
daa042513c Fix for updating TCP buffer size when switching network type
When PDP connects in GSM network, the TCP buffer window size is
set to max 8760. If the phone swicthes to UMTS, the TCP buffer
size is not updated to UMTS, i.e. GPRS buffer size is still
used with limited data transfer spead as a result.
This fix makes sure the TCP buffer size is updated when
switching network type.

Change-Id: Iaa527c84f56cae108f4c7276bbed10552faaff6c
2012-08-17 11:38:44 +02:00
The Android Open Source Project
f980b620d7 Reconcile with jb-mr1-release - do not merge
Change-Id: I03d49c7a1f65fb04224bbc246d160e4dd3829d06
2012-08-16 19:09:50 -07:00
The Android Automerger
df68e37e22 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-16 06:33:20 -07:00
Yuhao Zheng
22ac505a61 am 72465772: CTS test for WiFi watchdog.
* commit '72465772e01ba5d05e8f9af138e9f303e5bb2865':
  CTS test for WiFi watchdog.
2012-08-15 16:32:46 -07:00
Yuhao Zheng
72465772e0 CTS test for WiFi watchdog.
The new WiFi watchdog requires kernel/driver to export some packet loss
counters. This CTS tests whether those counters are correctly exported.

Change-Id: Ic764eff64ff2ef354b46f17e46eb74b14f191e4c
2012-08-15 15:24:36 -07:00
The Android Automerger
2886080e64 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-08-15 06:33:33 -07:00
Iliyan Malchev
9420b3fe53 Revert "CTS for timestamp in ScanResult"
This accompanies:
https://googleplex-android-review.googlesource.com/217002

This reverts commit e9adc27111

Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 16:52:32 -07:00
Iliyan Malchev
72010dbfcf Revert "CTS for timestamp in ScanResult"
This accompanies:
https://googleplex-android-review.googlesource.com/217002

This reverts commit e9adc27111

Change-Id: Ib37b72c59aad34fe9fd4461979c5f51af1218e37
2012-08-14 12:24:25 -07:00
Irfan Sheriff
e9adc27111 CTS for timestamp in ScanResult
Bug: 2961159
Change-Id: I8f1fd270a71173e2bd43b590914b7315232e4fba
2012-08-13 14:25:37 -07:00
Ashish Sharma
e4565dcbeb am 35d875ad: am 77b25796: Merge "Setup idletimer for network interface." into jb-mr1-dev
* commit '35d875ade38abd8dba6b7756ca612167ce8bcad0':
  Setup idletimer for network interface.
2012-08-10 16:09:34 -07:00
Haoyu Bai
92e03a787a Setup idletimer for network interface.
Cherry-picked from commit f71ca8a5728e425de61ba794c9653dd0b04f16e3 in
master. DO NOT MERGE

Change-Id: I6101c7ae041b4cc1237ce7a9983753dbdfa301d3
2012-08-10 15:58:34 -07:00
Jeff Sharkey
696aeb4e78 resolved conflicts for merge of ab4e251a to master
Change-Id: I59ad9fe6e777c6677331f83d5e1de28b66f28af7
2012-08-08 16:39:00 -07:00
Jeff Sharkey
9844730f62 Merge "Isolate NetworkStateTracker creation, test." into jb-mr1-dev 2012-08-08 16:25:41 -07:00
Jeff Sharkey
6b9021d76c Isolate NetworkStateTracker creation, test.
Change ConnectivityService to use a factory when creating
NetworkStateTrackers, which gives us a good place to inject mocks
for testing.  Add initial tests to verify that network routes are
added and removed as networks changed.

Change-Id: I11cbc61a84c2ed4afa2670036295b1494eab26e1
2012-08-08 16:23:41 -07:00
Jean-Baptiste Queru
b59a2f446b am dc250c32: Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest"
* commit 'dc250c329f994891fe4334f16681ddc05c573acd':
  Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest
2012-08-08 12:00:06 -07:00
Jean-Baptiste Queru
dc250c329f Merge "Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest" 2012-08-08 11:21:36 -07:00
Ashish Sharma
5f4cd1dfef Merge "Setup idletimer for network interface." 2012-08-06 16:22:04 -07:00
Haoyu Bai
8ce570b0f3 Setup idletimer for network interface.
Change-Id: I1251b60f4c3c31c75c2acd531495ca75bbb35ff5
2012-08-06 14:27:55 -07:00
Jeff Sharkey
976942a8ee Merge "Include network type that caused broadcast." into jb-mr1-dev 2012-08-06 13:40:44 -07:00
Jeff Sharkey
47905d1f1d Include network type that caused broadcast.
Network type can be obtained through EXTRA_NETWORK_INFO, but offer
it as first-class extra since the returned NetworkInfo is deprecated.

Bug: 6936247
Change-Id: Ief59577afd2bd930f0f4c5650b413feef86bfbc3
2012-08-06 11:45:01 -07:00
Jeff Sharkey
60e6c1ac06 Make generic BaseNetworkObserver.
This makes it easier to add new INetworkManagementEventObserver events
in future.

Change-Id: I432263d745558de4b878f313c1951230ed9db2b1
2012-08-05 14:32:41 -07:00
The Android Open Source Project
5d07675e26 Reconcile with jb-mr0-release jb-release
Change-Id: I897c49519ec349c3ac0fd8d1ca85f5cb7d8a27c9
2012-07-27 14:50:04 -07:00
Jeff Sharkey
a1ef1bec2a Split NST handler events away from CS internals.
Instead of sharing event space, use a different handler backed by
the same looper.

Change-Id: I11f1e4701c341665770ca640f3cba0c295bb7561
2012-07-26 14:09:09 -07:00
Irfan Sheriff
f16bea1f59 Ignore case on network info name
Bug: 6309231
Change-Id: I41244e25ccbf0d896edebf886c7f67ab1ded0a04
2012-07-25 12:10:40 -07:00
The Android Automerger
dd6fb0a419 merge in jb-release history after reset to jb-dev 2012-07-24 20:23:08 -07:00
Irfan Sheriff
c0e2e5715b Fix NPE in CTS test
wifiConfigurations returned by getConfiguredNetworks() can be null.
It is only incidental that this test passed fine in the past.

Bug: 6822950
Change-Id: I570ab6e7fd6cc5eb150914a5d7ca527ccc2f16cd
2012-07-23 10:19:34 -07:00
Haoyu Bai
b5da575fc7 Network data activity change intent for network interfaces.
The activity notification is received from netd, an intent
DATA_ACTIVITY_CHANGE is then raised for other part of the system to
consume.

Change-Id: Idfcc4763c51c5b314c57f546c12557082f06bebf
2012-07-17 17:13:03 -07:00
Wink Saville
e0bdc06669 am 406feb59: (-s ours) Create telephony-common and mms-common - DO NOT MERGE
* commit '406feb595d96f0b585a192922109d97a3fc3699b':
  Create telephony-common and mms-common - DO NOT MERGE
2012-07-17 12:36:56 -07:00
Wink Saville
406feb595d Create telephony-common and mms-common - DO NOT MERGE
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-17 12:23:09 -07:00
Keun young Park
30199405c3 change testRunner to CtsTestRunner
- unlock keyguard by default

Change-Id: I0452a72cfa54edfa79b485894ffd0493a71122ee
2012-07-12 12:57:30 -07:00
Wink Saville
64e3f78abb Create telephony-common and mms-common
These have been created to reduce the size and complexity
of frameworks/base.

mms-common was created by moving all of
  frameworks/base/core/java/com/google/android/mms
to:
   frameworks/opt/mms

telephony-common was created by moving some of
   frameworks/base/telephony
to:
   frameworks/opt/telephony

Change-Id: If6cb3c6ff952767fc10210f923dc0e4b343cd4ad
2012-07-11 16:02:08 -07:00
Catherine Liu
e6228bdbd7 Fix code problem in writePidDns
When app call startUsingNetworkFeature() to keep alive, there is a
code problem in writePidDns() to update the net.dnsX.<pid> property.

Change-Id: I83b02da4808f106c9ca00e350ad38e4bd5cba689
2012-06-29 16:09:35 -05:00
Brian Muramatsu
a4170d951a Merge "Fix WifiInfoTest flakiness" into jb-dev 2012-06-27 12:56:05 -07:00
Irfan Sheriff
f7e73fcc35 Add wifi & p2p Concurrency test
Change-Id: I5a35fb097b22b00366b189bad9c44a640a7d5b5a
2012-06-26 16:54:35 -07:00
Brian Muramatsu
237e076594 Fix WifiInfoTest flakiness
Poll a bit longer waiting for getNetworkId and getWifiState to return
the proper values. The bug reports seem to indicate that the WiFi
is shutting down properly.

Add a new static check method to PollingCheck that I think is simpler
than the existing way of creating a new PollingCheck, overriding
check, and then making sure to call run. This new variation also allows
you to specify a message rather than just "unexpected timeout."

Bug 6443337

Change-Id: I9f7c942f6e26b957bb717b58b1ab984acc556bf7
2012-06-26 15:05:08 -07:00
bs
562af417ed Fix CTS case testStartUsingNetworkFeature of ConnectivityManagerTest
Check if type of network is supported on the devices.
The device supporting TYPE_WIFI returns failureCode(-1).
But, not supported device returns wifiOnlyStartFailureCode or
wifiOnlyStopFailureCode.

Change-Id: I070bb19f6740367c476e78b884c2a36d111ff3ee
2012-06-26 20:23:47 +09:00
The Android Open Source Project
da0ba6beec Reconcile with jb-release
Change-Id: I4200341adee9a73e326fb9f0c6eefa3d8e01a2b9
2012-06-19 07:15:35 -07:00
The Android Automerger
fd9cdfb85d merge in jb-release history after reset to jb-dev 2012-06-19 07:03:42 -07:00
Nicolas Falliere
5889983f0b am 56bb344c: Merge "Added or fixed doctrings for required permissions." into jb-dev
* commit '56bb344ccfd3d261cea9987c98a17d0820279b17':
  Added or fixed doctrings for required permissions.
2012-06-18 17:42:57 -07:00
Nicolas Falliere
7842df58d0 Added or fixed doctrings for required permissions.
Bug: 6591338
Change-Id: Ia2092f9994854701b5fa1425c371817367ae07ec
2012-06-18 17:22:34 -07:00
Brian Muramatsu
28ca76b84d Flip condition in ApacheHttpClientTest
Make sure to wait first and then check the expected state rather than
check the expected state first and then waiting.

Bug 6293413

Change-Id: Ibcb1127b935708c51fafdc8624cb3a7eefc01bda
2012-06-08 16:45:02 -07:00
The Android Open Source Project
29cdec9fd3 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I2b5e77195eae1a9676c2530a9023290936e55255
2012-05-29 09:39:33 -07:00