118 Commits

Author SHA1 Message Date
Narayan Kamath
3bdd327f85 Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
2015-02-12 11:15:49 +00:00
Narayan Kamath
d627c6761f Remove some crufty "core" tests.
nobody runs these, and these things are well tested elsewhere
and a part of CTS.

Change-Id: I1ec00f2a085fc82f902f538ace692ac989ca03df
2014-12-10 19:49:59 +00:00
Kenny Root
d00ced983e am b0cb0734: Merge "Track change to Conscrypt"
* commit 'b0cb07348e6320ce51d0e8b88d240ecf834850d1':
  Track change to Conscrypt
2014-11-03 18:40:55 +00:00
Kenny Root
b0cb07348e Merge "Track change to Conscrypt" 2014-11-03 18:34:00 +00:00
Narayan Kamath
2e1bd46a15 am ef5d43a7: Merge "Revert "Revert "Remove unused apache related API."""
* commit 'ef5d43a7cf694ffac8b0069aa5026862d6b32735':
  Revert "Revert "Remove unused apache related API.""
2014-11-03 14:31:11 +00:00
Narayan Kamath
4b8f1846ca Revert "Revert "Remove unused apache related API.""
This reverts commit 31f54ef8150019e4a8c501181806199ef7699fea.

Change-Id: Ib8fc22e3a23b2c06400cd687e8ed9cef9a11d09b
2014-11-03 13:32:10 +00:00
Kenny Root
8a97063720 Track change to Conscrypt
Change way in which an outside caller can get the preferred SSLContext.

Bug: 17136008
Change-Id: Ide578664bcb605304322bfddd2e640a63042fa09
2014-10-31 12:06:09 -07:00
Narayan Kamath
fa945c105b am e87d36f8: Merge "Revert "Remove unused apache related API.""
* commit 'e87d36f8925a34f85ba80c886757d07ad03fed42':
  Revert "Remove unused apache related API."
2014-10-29 11:30:11 +00:00
Narayan Kamath
d3389e2f32 resolved conflicts for merge of 9834af9c to stage-aosp-master
Change-Id: Ibdada14406f49684cf345162204b9810452f25a2
2014-10-29 11:23:45 +00:00
Narayan Kamath
31f54ef815 Revert "Remove unused apache related API."
This reverts commit 3f2714e18bfd979aefefa1d45c50a69fca21cf14.

Change-Id: Ie0e51897ab509d112dc37ca7b90b4139b0a82d8d
2014-10-27 16:55:14 +00:00
Narayan Kamath
3f2714e18b Remove unused apache related API.
Hidden and used only in unit tests.

Change-Id: I492b735f0f7e129946e28c31ad9d91c98aacf987
2014-10-24 14:27:07 +01:00
Christopher Lane
b72d8b4091 Add support for custom TXT records in NSD
Change-Id: I8e6dc9852ad4d273c71ad6a63a7fbd28a206806d
2014-04-14 14:10:36 -07:00
Torne (Richard Coles)
d394355d75 Delete HttpHeaderTest.testCacheControlMultipleArguments.
This test depends on internals of the old WebView to work which have
already been removed. It doesn't appear to be testing anything useful.

Bug: 10427705
Change-Id: I5e93b212c33f22776050b6e1ec639e23f41a1d4a
2013-10-15 11:18:08 +01:00
Kenny Root
12e752225a Track change to JSSE provider
Change-Id: I35e824e47ad758ab6408e91e2ba5dcda053a82f5
2013-04-29 15:15:27 -07:00
Jesse Wilson
0102c21f6b Track libcore tests moving from frameworks/base to libcore.
Bug: http://b/3073226
Change-Id: I07076e6ed74fcae5482dff477ed102c770c197c9
2011-12-13 13:35:04 -05:00
Isaac Levy
bc7dfb58bf WifiWatchdogService - disable bad connections
Complete rewrite of WifiWatchdogService.java.  Checking for connectivity and managing wifi upon failure detection.

Change-Id: Ifcb8b5d7e0112cbc2f2282d76fdc93ea15527a44
2011-06-24 15:48:10 -07:00
Joe Onorato
43a17654cf Remove the deprecated things from Config.java. These haven't been working since before 1.0.
Change-Id: Ic2e8fa68797ea9d486f4117f3d82c98233cdab1e
2011-04-07 19:23:05 -07:00
Brad Fitzpatrick
5db7fd6b70 am f7a9b869: am 1e7fb7ae: Merge "Error in compound cache-control header."
* commit 'f7a9b8691918642db74a667a71028c0a77b527ff':
  Error in compound cache-control header.
2011-03-30 08:21:23 -07:00
Henrik Baard
eb0ced7a09 Error in compound cache-control header.
A cache control header containing both no-cache and max-age attribute does not
behave as expected.

Cache-Control: no-cache, max-age=200000

Will set expired to 20000ms seconds, ignoring the no-cache header. My
interpretation is that the no-cache header should not be ignored in
this case.

Change-Id: Iadd1900e4d2c6c0dacc6bb3e7b944cf78ca9b266
2011-03-29 08:54:09 +02:00
Jesse Wilson
74815d332c Remove SSLPerformanceTest and DatabaseSessionCache.
These aren't being run.

Change-Id: I9afc617a424c675578185ac66a4f6ac3af9afacf
2011-02-10 13:17:24 -08:00
Brian Carlstrom
929a1c2192 Removing android.security.MessageDigest
Bug: 3392028
Change-Id: I6b9732da17d086ba00c846c3ad1c7fb39baf9502
2011-02-01 22:25:47 -08:00
Jesse Wilson
f3efdf5013 Move URLTest tests to libcore.
These tests were migrated to libcore in change ID I5a6bcdf1c03d0c36b11552ae086d0dece0440f64.

Change-Id: Idc2d8fc3681b77c9a4c19a192a202bc556a48d23
2011-01-21 10:37:19 -08:00
Carl Shapiro
d3b8eb098d Remove minimum heap size test now that the underlying interface is gone.
Change-Id: I4431247286dfd93ad0c3af9ebbba2ece92c35308
2011-01-12 14:20:27 -08:00
Elliott Hughes
ffcac1a127 Remove tests for dead API.
We removed the implementation, so there's no point trying to test it. (The
methods are still there for binary compatibility, which is why this still
compiled.)

Change-Id: I51f392f3dab542fca0c80fab4974354e2c689b9e
2011-01-10 12:57:36 -08:00
Jesse Wilson
bd1c5da28d Remove unused performance tests.
Change-Id: I5a252e314831716f99ce5fbb32d983c7473ee787
2010-12-21 10:23:28 -08:00
Jesse Wilson
ab9b6285a0 Merge "Move 41 tests to libcore, closer to the tested code. (2nd half)" 2010-12-14 15:41:44 -08:00
Jesse Wilson
29ac247d21 Move 41 tests to libcore, closer to the tested code. (2nd half)
Change-Id: I18650718a7e49c84a0cc3c5b0c1172c71d2d54cf
http://b/3073226
2010-12-14 15:19:48 -08:00
Jesse Wilson
437afa8c4a Move HashMapTest from frameworks/base to libcore (second half)
Change-Id: I178e376ab12d82e23a8b0ddd267a6c150c9bbddf
http://b/3073226
2010-12-14 13:49:36 -08:00
Elliott Hughes
6190ba5a94 Merge "NIOTest fixes." 2010-10-08 12:59:43 -07:00
Elliott Hughes
ddd49c28b0 NIOTest fixes.
I've also broken the test up a bit, so it's easier to see what's failing.
(For the particular bug I'm investigating, only heap byte[]-backed Buffers
are broken.)

Bug: 3066167
Change-Id: I2f747414bd48eb8c666da5b31870bf39601911e2
2010-10-07 18:33:43 -07:00
Brett Chabot
111a4135d8 am b9a40068: Merge "Failing test cleanup." into gingerbread
Merge commit 'b9a40068b590b86904b40bf466571b140d0f94b4' into gingerbread-plus-aosp

* commit 'b9a40068b590b86904b40bf466571b140d0f94b4':
  Failing test cleanup.
2010-10-05 11:05:37 -07:00
Brett Chabot
2ad24f944e Failing test cleanup.
Change-Id: I7cabc6ff2ec1fcb80dede5da03b03622a5bae021
2010-10-04 19:55:14 -07:00
Brian Carlstrom
0535d8577f am 94126238: Merge "Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments" into gingerbread
Merge commit '94126238427f04ecb86fe6832113afb2f04e89b5' into gingerbread-plus-aosp

* commit '94126238427f04ecb86fe6832113afb2f04e89b5':
  Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
2010-09-14 11:17:22 -07:00
Brian Carlstrom
2c42c8fbaf Remove SSLContextImpl.engineInit(..) that takes persistent cache arguments
Bug: 2672817

Change-Id: If5f10fa16eaf5676a0c1540463759cd4e0e837de
2010-09-14 00:11:14 -07:00
Brian Carlstrom
90b3135d8b am 4d672988: Merge "Remove "StringTest.java"." into gingerbread
Merge commit '4d672988fed7fbdd887fe78603fa2eaf713031ad' into gingerbread-plus-aosp

* commit '4d672988fed7fbdd887fe78603fa2eaf713031ad':
  Remove "StringTest.java".
2010-08-25 11:04:26 -07:00
Brian Carlstrom
5c8e760bcb Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.

Conflicts:

	tests/CoreTests/android/core/StringTest.java

git cherry-pick -e 935022a99dac5454fc478e221b6392f3ba467009

Change-Id: I0bd172f2703bbcd6381920d40244165234fef4a1
2010-08-24 21:04:25 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
2010-08-05 10:40:45 -07:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
2010-08-04 23:47:38 -07:00
Romain Guy
3fb33c7262 Merge "Added method getPreferredHttpHost" 2010-07-15 10:49:47 -07:00
Andreas Sandblad
2986f858ae Added method getPreferredHttpHost
Added method for returning preferred proxy which takes both
localhost and Wi-Fi into account. This is a convenient method
to clients which only wants to set a correct proxy and don't
want to build in dependency to if Wi-Fi is active or not.
Currently no Wi-Fi proxy is supported by the system, but once
added, this method could return a suitable proxy for Wi-Fi.

Change-Id: I8c9c2879351fd25a20ea82a2cb000f226248c357
2010-07-14 08:49:46 +02:00
Henrik Baard
c692e8c4da Make HTTP Header class handle multiple cache-control fields.
The HTTP specification states the following about the fields:
Multiple message-header fields with the same field-name MAY be present
in a message if and only if the entire field-value for that header field
is defined as a comma-separated list [i.e., #(values)]. It MUST be
possible to combine the multiple header fields into one "field-name:
field-value" pair, without changing the semantics of the message, by
appending each subsequent field-value to the first, each separated by a
comma. The order in which header fields with the same field-name are
received is therefore significant to the interpretation of the combined
field value, and thus a proxy MUST NOT change the order of these field
values when a message is forwarded.

Change-Id: I1a6fe5cc8f541f8e80d559641d270d09eac9d85c
2010-07-14 08:20:40 +02:00
Brett Chabot
0dc59e78e1 More framework tests cleanup.
Move all tests for android.* classes from tests/AndroidTests and
tests/CoreTests into framework/base/<core|graphics>/tests.

Consolidate all tests for java.* classes to tests/CoreTests.
Eventually hopefully these will be moved to dalvik/ somewhere.

Remove tests/AndroidTests entirely.

Change-Id: I86584d086ab7bd045bb38a10b699907805298a95
2010-04-01 18:31:11 -07:00
Brian Carlstrom
778ce48665 Issue 5697: getContextClassLoader returns a non-application classloader
ActivityThread should try to set the value for Java
Thread.getContextClassLoader to the PathClassLoader that loaded the
APK's classes so that Java frameworks that use the Java context class
loader, which is not to be confused with the
android.content.Context.getClassLoader which serves a similar purpose
in the Android framework.

However, we avoid setting the Java context ClassLoader to the APK's
PathClassLoader if there is a static indication that multiple packages
may share the VM, since they could load in an unpredictable order
leading to different values for the thread local Java context
ClassLoader. In this case, we instead use a specially created
WarningContextClassLoader that warns the user the first time the Java
context ClassLoader.

Currently the static indications that a package might share a VM with
other packages are the presence in the AndroidManifest of a
sharedUserId or requesting a non-default application process name.
2010-02-23 15:58:00 -08:00
Brett Chabot
e70f61b116 Retry test-runner tests move.
This time change the frameworks makefile so it only includes test-runner/src
in the public API.
2010-02-20 17:29:05 -08:00
Brett Chabot
c1ca8c51c6 Revert "Move framework test-runner unit tests to be closer to their source."
This reverts commit 12093976a4842a795491cfd2b1d3b71e18503f2d.
2010-02-19 10:31:05 -08:00
Brett Chabot
12093976a4 Move framework test-runner unit tests to be closer to their source.
Move the test-runner source into a separate src folder to accommodate the test
move.
2010-02-19 09:58:29 -08:00
Fred Quintana
c5d1c6db61 add sync polling
- added the ability to specify that a sync (of account/authority/extras)
  should occur at a given frequency
- the existing daily poll code was replaced with seeding each
  account/authority with a 24 hour periodic sync
- enhanced the "adb shell dumpsys content" output to show the
  periodic syncs and when they will next run
2010-02-05 15:16:20 -08:00
Elliott Hughes
809cf4481f Remove "StringTest.java".
This only tests stuff that's already better tested in dalvik/libcore, plus
private ICU API (RuleBasedNumberFormat) we'd like to remove, and that this
is the only caller of.
2010-02-03 11:33:47 -08:00
Patrick Scott
9d0f609251 There is no ../com directory and the build (find) agrees. 2010-01-28 09:03:14 -05:00
Neal Nguyen
22e31e5b60 Moving framework core tests closer to their source files.
Phase 2 of test case cleanup; distributing CoreTests files closer to their respective sources under frameworks.
2010-01-27 13:36:38 -08:00