Commit Graph

1102 Commits

Author SHA1 Message Date
Jason Monk
0a9cc50662 Guarantee that PAC Local Proxy owns Port
This changes the PAC support to not broadcast the Proxy information until
the Local Proxy has started up and successfully bound to a port so that
the local proxy information can be guaranteed to be owned by the proxy.

Bug: 10459877
Change-Id: I175cd3388c758c55e341115e4a8241884b90d633
2013-09-13 09:53:26 -04:00
The Android Automerger
0d139cc267 merge in klp-release history after reset to klp-dev 2013-09-12 06:01:29 -07:00
Yuhao Zheng
0e1e5c93a2 Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
2013-09-11 14:39:19 -07:00
Jeff Sharkey
cb8f69b7bf am 6cb01323: Merge changes Ib1274847,I2eb2a1bf into klp-dev
* commit '6cb013235dd2a7520fccfddbfb22dfccb71dc3d0':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 13:19:12 -07:00
Jeff Sharkey
6cb013235d Merge changes Ib1274847,I2eb2a1bf into klp-dev
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
2013-09-11 20:16:59 +00:00
Yuhao Zheng
404c7b5df3 am 518c0afa: Merge "Fix for the toggle airplane mode hidden API" into klp-dev
* commit '518c0afaea02f9a680f6912bde2d73b0357236ca':
  Fix for the toggle airplane mode hidden API
2013-09-11 10:38:36 -07:00
Yuhao Zheng
239a3b22f1 Fix for the toggle airplane mode hidden API
Fix to https://googleplex-android-review.git.corp.google.com/#/c/356900/
Previous implementation throws SecurityException when the API is called from apps.
bug:10653570

Change-Id: I95ae6f07db74d881f1a8d3d40a6486105a068e90
2013-09-11 09:44:28 -07:00
Jeff Sharkey
168cd72f76 Request all tethering interfaces, fix corruption.
netd now tracks statistics for tethered interfaces across tethering
sessions, so switch to asking for all tethering stats.  (Currently
we're double-counting all tethering data, ever since it started
tracking across sessions.)

Also catch OOME to handle corrupt stats files, which we then dump to
DropBox and then start over.

Bug: 5868832, 9796109
Change-Id: I2eb2a1bf01b993dd198597d770fe0e022466c6b9
2013-09-10 21:03:30 -07:00
The Android Automerger
03186cc000 merge in klp-release history after reset to klp-dev 2013-09-10 14:28:38 -07:00
Yuhao Zheng
9b7d1f2bee am e91a3f52: Merge "Add a hidden API to toggle airplane mode." into klp-dev
* commit 'e91a3f5229405b39a3ba59aa0a3e44527eef063e':
  Add a hidden API to toggle airplane mode.
2013-09-10 10:13:22 -07:00
Yuhao Zheng
b77f15d90b Add a hidden API to toggle airplane mode.
Added a hidden API under ConnectivityManager to toggle airplane mode.
This may be a temp solution for b/10653570.
bug:10653570

Change-Id: I0b2b42230073289eb8dc6891317d62b84e26c133
2013-09-10 09:57:12 -07:00
The Android Automerger
77ca71cce5 merge in klp-release history after reset to klp-dev 2013-09-09 06:01:43 -07:00
Wink Saville
b2aadf2782 am f4186098: Merge "Tighten test for warm sim and add more debug." into klp-dev
* commit 'f41860989acb033796bc1aad89c2e65b676ae744':
  Tighten test for warm sim and add more debug.
2013-09-08 18:34:11 -07:00
Wink Saville
f41860989a Merge "Tighten test for warm sim and add more debug." into klp-dev 2013-09-09 01:32:45 +00:00
Ying Wang
7e899df9dc am cb5620b2: Fix docs build.
* commit 'cb5620b2c4c99f75da6fbcea3c753f8d85a64381':
  Fix docs build.
2013-09-06 22:59:40 -07:00
Ying Wang
cb5620b2c4 Fix docs build.
Change-Id: I6fd0d711b2cc7726fdaa9119ee467ed6fab82de1
2013-09-06 22:53:16 -07:00
Robert Greenwalt
c63355d698 am dac56db6: Merge "Fix the build." into klp-dev
* commit 'dac56db680251dd9bd3913b6152d33457366c722':
  Fix the build.
2013-09-06 17:02:28 -07:00
Robert Greenwalt
39dd04c648 Fix the build.
Change-Id: Ia5d29de9db7ea8fd467b3bde551a8cfb95877b41
2013-09-06 16:49:37 -07:00
Robert Greenwalt
a231626541 am 67e0bdf7: Merge "Setting MTU size for specific network." into klp-dev
* commit '67e0bdf7cf8bf29b5ceefa4c5c47893f6fd099c6':
  Setting MTU size for specific network.
2013-09-06 15:44:24 -07:00
Robert Greenwalt
67e0bdf7cf Merge "Setting MTU size for specific network." into klp-dev 2013-09-06 22:42:10 +00:00
Sreeram Ramachandran
eed7168030 am cfc7c575: Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev
* commit 'cfc7c57504551ec6df8eb989d6515a59a796069c':
  Minor fixes: Add a missing "break" and some cosmetic fixes.
2013-09-06 15:40:50 -07:00
Sreeram Ramachandran
cfc7c57504 Merge "Minor fixes: Add a missing "break" and some cosmetic fixes." into klp-dev 2013-09-06 22:37:21 +00:00
sy.yun
4aa73924fd Setting MTU size for specific network.
Able to config network specific MTU size. Normally, the default size of MTU is 1500.
 US - ATT 1410, TMUS 1440, SPRINT 1422
 KR - SKT 1440, KT 1450, LGU+ 1428
 JP - KDDI 1420, SoftBank 1340
 CA - RGS 1430, FIDO 1430, MTS 1430, BELL 1358, SaskTel 1358
 AU - TEL 1400

Bug: 10195070
Change-Id: Ie18650b37a3d44af944f2dae4aa97c04fb12cd5e
2013-09-06 15:26:19 -07:00
Wink Saville
9685cd1d17 Tighten test for warm sim and add more debug.
- Require a non-204 response multiple times before declaring a
redirected error and hence a warm sim.

- If there is no connection or dns don't declare its a warm-sim.

- Add printing of the http headers to try to get more information
if we still get a false positive result.


Bug: 9972012
Change-Id: Ic115685cdbbe39c2b4de88b128eaf8d2ea96b45c
2013-09-06 09:54:24 -07:00
Wink Saville
67f299d633 am 1256d3e5: am 55c4f2aa: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '1256d3e505c6629d82fcb4610068191f39eab5f3':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:25:32 -07:00
Wink Saville
1256d3e505 am 55c4f2aa: am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '55c4f2aa7a0c6d765cf33e5e403365bc138fc025':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:19:40 -07:00
Wink Saville
55c4f2aa7a am 50f86448: am 59a9884b: Merge "Do not change NetworkInfo.DetailedState." into jb-mr2-dev
* commit '50f864480d6e9cf9e4d83b4533e3764753b4d408':
  Do not change NetworkInfo.DetailedState.
2013-09-06 09:17:19 -07:00
Lorenzo Colitti
350ce21732 am a5642e48: Merge "Add a function to replace all the link addresses." into klp-dev
* commit 'a5642e48b04aa51ec0dd9288e9c41b7c1b9762a3':
  Add a function to replace all the link addresses.
2013-09-05 16:06:12 -07:00
Lorenzo Colitti
a5642e48b0 Merge "Add a function to replace all the link addresses." into klp-dev 2013-09-05 23:03:24 +00:00
Wink Saville
b1a3202e79 Do not change NetworkInfo.DetailedState.
I'd changed DetailedState to force ConnectivityService to treat
provisioning apn's specially. In particular so that they wouldn't
be identified they were fully connected until the provisioning
actually started. The problem is that DetailedState is a public enum
that has a CTS test and just changing the CTS to allow for the new
state (CONNECTED_TO_PROVISIONING_NETWORK) was inappropriate.

Instead I've added a new mIsConnectedToProvisioningNetwork variable
and used the DetailedState.SUSPENDED as the intermediate state.

Bug: 10620248
Change-Id: Id4a842398cad67455541ce629959351c27d83639
2013-09-05 12:02:25 -07:00
Vinit Deshapnde
a2b439bc95 am 77dc9372: Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev
* commit '77dc937242a713538b5457db05703f619ccfb09d':
  Rename LinkInfo to LinkQualityInfo
2013-09-05 10:53:16 -07:00
Vinit Deshapnde
77dc937242 Merge "Rename LinkInfo to LinkQualityInfo" into klp-dev 2013-09-05 17:50:19 +00:00
Lorenzo Colitti
174782b0fc Add a function to replace all the link addresses.
Bug: 10232006
Change-Id: I689ce4735999dac2ab5e1fae09d80b1f734292a1
2013-09-05 13:02:54 +09:00
Vinit Deshapnde
00d4b8a987 Rename LinkInfo to LinkQualityInfo
This change renames the LinkInfo objects to LinkQuailtyInfo. The API is
still hidden; but it can be accessed via reflection.

Bug: 10342372

Change-Id: Ieccea87c467ceae5d7f76298b137573f67396cd6
2013-09-04 14:11:24 -07:00
The Android Automerger
3184a7ab93 merge in klp-release history after reset to klp-dev 2013-09-02 06:01:11 -07:00
Wink Saville
5fda0c1e0d Merge commit 'a37f06d7' into manualmerge
* commit 'a37f06d7':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-30 11:24:03 -07:00
Wink Saville
ed78d6a47f am 35bd30b1: Merge "Merge commit \'a37f06d7\' into manualmerge" into klp-dev
* commit '35bd30b184b321754697b992aa5c581e204d530a':
  Add support for handling mobile provisioning networks.
2013-08-29 15:14:02 -07:00
Wink Saville
cb117d31cb Merge commit 'a37f06d7' into manualmerge
* commit 'a37f06d7':
  Add support for handling mobile provisioning networks.

Conflicts:
	core/java/android/net/CaptivePortalTracker.java
	core/java/android/net/ConnectivityManager.java
	core/java/android/net/IConnectivityManager.aidl
	core/java/android/net/MobileDataStateTracker.java
	core/res/AndroidManifest.xml
	services/java/com/android/server/ConnectivityService.java

Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 14:57:08 -07:00
Wink Saville
a37f06d7d5 am 8cb2f42e: am 9a1a7ef5: Add support for handling mobile provisioning networks.
* commit '8cb2f42eea2ef3b249528aa7913fc7a6dfc6b741':
  Add support for handling mobile provisioning networks.
2013-08-29 10:26:06 -07:00
Wink Saville
9a1a7ef57c Add support for handling mobile provisioning networks.
When a sim is new or it has expired it needs to be provisioned
with the carrier. Basically provisioning is associating a sim with
a user account. When a sim isn't provisioned then operators will
restrict access to the network and only allow certain addresses
or services to be used.

This set of changes allows two types of provisioning networks to be
recognized. The first is a network that causes all DNS lookups to be
redirected to a different address than was intended. This is exemplified
by how T-Mobile works.

The second technique uses a special apn for provisioning. An example is
AT&T where lwaactivate is the provisioning apn and broadband is the
normal apn. We first try broadband and if we are unable to connect we
try lwaactivate. When we see the activate we identify it as special and
the ApnContext.isProvisioningApn will return true.

In the future our plan is to create a new network type that can be added
to the apn list, but for now it identified by name.

Here is a list of significant changes:

 - CaptivePortalTracker now only test WiFi networks instead of all networks
 - checkMobileProvisioning checks for provisioning networks and doesn't
   try to ping.
 - IConnectivityManager.aidl changes:
   * getProvisioningOrActiveNetworkInfo was added to and used by Manage
     mobile plan in WirelessSettings so even when there is no active
     network it will still allow provisioning. Otherwise it would report
     no internet connection.
   * setSignInErrorNotificationVisible is used by both
     CaptiviePortalTracker and checkMobileProvisioning so they use the
     same code for the notifications.
   * checkMobileProvisioning was simplified to have only a timeout as
     returning the result is now harder as we abort simultaneous call
     otherwise we'd could get into loops because we now check every time
     we connect to mobile.
 - Enhanced MDST to handle the provisioning network.
 - Added CONNECTED_TO_PROVISIONING_NETWORK to NetworkInfo to make a new
   state so we don't announce to the world we're connected.
 - TelephonyIntents.ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN
   is sent by the low level data connection code to notify Connectivity
   Service that a provisioning apn has connected. This allows CS to
   handle the connection differently than a normal connection.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
2013-08-29 08:55:16 -07:00
The Android Automerger
52e4748102 merge in klp-release history after reset to klp-dev 2013-08-29 06:01:01 -07:00
Jason Monk
43cfb75509 am c711d7a5: Merge "Don\'t clear Global Proxy on boot." into klp-dev
* commit 'c711d7a5e936f760bcd8cdf6afcfbf12020e983e':
  Don't clear Global Proxy on boot.
2013-08-28 07:43:39 -07:00
Jason Monk
c711d7a5e9 Merge "Don't clear Global Proxy on boot." into klp-dev 2013-08-28 14:41:15 +00:00
Sreeram Ramachandran
1b5a3acb8b Minor fixes: Add a missing "break" and some cosmetic fixes.
Change-Id: Ie614a7b47185fd511fdc3f064620e46ab7d6d8f8
2013-08-27 11:41:19 -07:00
Jason Monk
01a790ad55 Don't clear Global Proxy on boot.
Doesn't clear the global proxy when a deprecated one is not found because
there still may be a non-deprecated global proxy present.

Bug: 10457179
Change-Id: I68e6d5aee7b4940f9315484060c7d82cb8ccfa70
2013-08-27 10:51:24 -04:00
The Android Automerger
51f66db5f2 merge in klp-release history after reset to klp-dev 2013-08-27 06:01:45 -07:00
Lorenzo Colitti
b09653b87e am 79d505d0: Merge "Add a simple test for NetworkManagementService." into klp-dev
* commit '79d505d0757c9f4381f011cfc43532c4331c5f47':
  Add a simple test for NetworkManagementService.
2013-08-26 21:10:36 -07:00
Lorenzo Colitti
79d505d075 Merge "Add a simple test for NetworkManagementService." into klp-dev 2013-08-27 04:08:54 +00:00
Wink Saville
cc42a7852c am 381c91da: am daed2e2b: (-s ours) am 33283a97: am d23fa090: DO NOT MERGE: MDST is not ready until connected to DcTracker.
* commit '381c91dac54fdcfbf4aacdaa855d2b8ec7ebb59f':
  DO NOT MERGE: MDST is not ready until connected to DcTracker.
2013-08-26 15:04:28 -07:00
Wink Saville
9a9ef401ba am 23d32ca4: am 85811798: am b42beeaf: am 54c5e169: In isMobileOk don\'t execute finally if mobile data is not supported.
* commit '23d32ca4b9678377057634ac8915cb6a2180bcea':
  In isMobileOk don't execute finally if mobile data is not supported.
2013-08-26 15:04:25 -07:00