summaryrefslogtreecommitdiffstats
path: root/core/tests
Commit message (Collapse)AuthorAgeFilesLines
* Add android.net.IpPrefix#contains()Erik Kline2015-04-142-0/+33
| | | | | | | | | This was originally to avoid RuntimeException in RouteInfo#matches(): When an IPv6 prefix with a length greater than the max permitted for IPv4 is matched against an Inet4Address, the call to NetworkUtils throws RuntimeException. Change-Id: I92e2bd19a4e7d656cf682fd27678da07e211850d
* Load libraries directly from apkDmitriy Ivanov2015-04-077-3/+133
| | | | | | | | | | Introduced new 'extractNativeLibs' attribute to manifest/application. Setting it to false prevents installer from extracting library from apk. The default value for extractNativeLibs is true. Bug: 8076853 (cherry picked from commit ff193d642eea7128faad837d19e347cd25212c27) Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* Cleanse HTTP, HTTPS, and FTP URLs in Uri.toSafeString.Alex Klyubin2015-04-011-0/+52
| | | | | | | | | This makes the hidden API android.net.Uri.toSafeString omit most parts of HTTP, HTTPS, and FTP URLs to avoid leaking anything unsafe. Only the host and port are retained for these URLs. Bug: 19215516 Change-Id: I2e9e33d9afaa9de5dd07a40532d56f0a2179f62a
* resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aospAlex Klyubin2015-02-111-5/+6
|\ | | | | | | Change-Id: Ic20b6c8851458483dd73a144bd5ae6e8d141e62a
| * Move hidden ApplicationInfo flags into a separate field.Alex Klyubin2015-02-111-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The public API field android.content.pm.ApplicationInfo.flags can support only 32 flags. This limit has been reached. As a short term workaround to enable new public flags to be added, this CL moves flags which are not public API into a separate new field privateFlags and renames the affected flags constants accordingly (e.g., FLAG_PRIVILEGED is now PRIVATE_FLAG_PRIVILEGED). The new privateFlags field is not public API and should not be used for flags that are public API. The flags that are moved out of ApplicationInfo.flags are: * FLAG_HIDDEN, * FLAG_CANT_SAVE_STATE, * FLAG_FORWARD_LOCK, and * FLAG_PRIVILEGED. NOTE: This changes the format of packages.xml. Prior to this CL flags were stored in the "flags" attribute. With this CL, the public flags are stored in a new "publicFlags" attribute and private flags are stored in a new "privateFlags" attribute. The old "flags" attribute is interpreted by using the old values of hidden/private flags. Change-Id: Ie23eb8ddd5129de3c6e008c5261b639e22182ee5
* | am 12b26c12: am 21702263: Merge "Add a unit test for StaticIpConfiguration."Lorenzo Colitti2015-02-051-0/+225
|\ \ | |/ | | | | | | * commit '12b26c12483633f7a75d1f1c9ead73eaf6056811': Add a unit test for StaticIpConfiguration.
| * Add a unit test for StaticIpConfiguration.Lorenzo Colitti2015-02-041-0/+225
| | | | | | | | Change-Id: I68c735def8a242da0c8f95b7c5ea680ed902dab7
* | am 3a6d8f54: am 90d5bd8d: am feb362a5: am a0d3bfbe: am 5c9d0de1: am ↵Jon Larimer2015-01-301-5/+5
|\ \ | | | | | | | | | | | | | | | | | | 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation * commit '3a6d8f5473f2451a0bdf13d4cc1d31e419d23f0c': Fix build breakage in older branches by avoiding <> notation
| * \ am feb362a5: am a0d3bfbe: am 5c9d0de1: am 545dd853: am 9a425aa7: am ↵Jon Larimer2015-01-301-5/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation * commit 'feb362a5d194b30226caf2efbaae77991007c65c': Fix build breakage in older branches by avoiding <> notation
| | * \ am 5c9d0de1: am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am ↵Jon Larimer2015-01-301-5/+5
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 48c95c43: Fix build breakage in older branches by avoiding <> notation * commit '5c9d0de174caf151937f19aa6898f60bce3fb4f4': Fix build breakage in older branches by avoiding <> notation
| | | * \ am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build ↵Jon Larimer2015-01-301-5/+5
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | breakage in older branches by avoiding <> notation * commit '545dd853bffbf778a0a44816ac6ed381b13f2158': Fix build breakage in older branches by avoiding <> notation
| | | | * \ am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches ↵Jon Larimer2015-01-301-5/+5
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by avoiding <> notation * commit '159aa73574804967aded45d06b70df5a8dd64a58': Fix build breakage in older branches by avoiding <> notation
| | | | | * \ am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding ↵Jon Larimer2015-01-301-5/+5
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <> notation * commit 'd403180997898c98f0be15b810c4c9dd9002f92c': Fix build breakage in older branches by avoiding <> notation
| | | | | | * | Fix build breakage in older branches by avoiding <> notationJon Larimer2015-01-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e3d523dac1f364f52f0d2cab479c1705d667e5a
| | * | | | | | am ea63fd7f: am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am ↵Jon Larimer2015-01-291-0/+263
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc731e6e: Merge "Fix ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev * commit 'ea63fd7f9b4bb2701c9d12ab8775867dbdeefcf1': Fix ParceledListSlice to enforce the same concrete types among its elements.
| | | * | | | | am 88add689: am a5ccca24: am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ↵Jon Larimer2015-01-291-0/+263
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParceledListSlice to enforce the same concrete types among its elements." into jb-mr2-dev * commit '88add68942694fc643518bcf5c26f6c3df7e9aa0': Fix ParceledListSlice to enforce the same concrete types among its elements.
| | | | * | | | am 2982d648: am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to ↵Jon Larimer2015-01-291-0/+263
| | | | |\ \ \ \ | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enforce the same concrete types among its elements." into jb-mr2-dev * commit '2982d64802ed0d5b59130680c43485e9d7862e50': Fix ParceledListSlice to enforce the same concrete types among its elements.
| | | | | * | | am de9a76ed: am fc731e6e: Merge "Fix ParceledListSlice to enforce the same ↵Jon Larimer2015-01-291-0/+263
| | | | | |\ \ \ | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concrete types among its elements." into jb-mr2-dev * commit 'de9a76ed997c300a6c5f2f82c517719503af9045': Fix ParceledListSlice to enforce the same concrete types among its elements.
| | | | | | * | Fix ParceledListSlice to enforce the same concrete types among its elements.Adam Lesinski2015-01-281-0/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17671747 Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966 (cherry picked from commit 3df1c38ee098872352086e03d6f1adb16796ee29)
* | | | | | | | am b5108949: am e4a031e3: Merge "New trick to install bad dex file."Ying Wang2015-01-201-2/+3
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * commit 'b51089499c8c39fce47deccf70d3ea069c58b471': New trick to install bad dex file.
| * | | | | | | New trick to install bad dex file.Ying Wang2015-01-201-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we use LOCAL_JAVA_RESOURCE_FILES to override the normally generated classes.dex with a bad dex file. Now as we have moved Java resource processing before running jarjar, dx would fail for the bad classes.dex inside the classes.jar. Instead we override the target specific variable PRIVATE_DEX_FILE to inject the bad dex file. (cherry-picked from commit f122d90c290c789e0d0085127beebdcf1935c127) Bug: 18837479 Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
* | | | | | | | am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest"Neil Fuller2015-01-161-139/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b55011e4265f866604ed0c3ffe0241436682c3d2': Removing HttpResponseCacheTest
| * | | | | | | Removing HttpResponseCacheTestNeil Fuller2015-01-151-139/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving HttpResponseCacheTest.java from frameworks/base/core/tests/coretests/src/android/net/http to cts/tests/tests/net/src/android/net/http/cts Change-Id: I61a07c53f8d0ef55d35b928f244e4680725b76ef
* | | | | | | | am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation ↵Neil Fuller2015-01-121-1/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of an OkHttp upgrade." * commit 'f5f345cf929908bd863143815743c44778d29e4a': Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
| * | | | | | | Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.Neil Fuller2015-01-091-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OkHttp recently changed the behavior of their caching with commit e74e3f3bf744ef7f4d8ee724a7cf2347e486cfab - it is now neccessary to close the inputstream (or disconnect the HttpURLConnection) for a response to be cached. This change is (effectively) a no-op prior to the upgrade. The behavior is undefined as to whether closing the input stream is required for caching. OkHttp's new behavior is consistent with other HttpURLConnection implementations tried. Change-Id: Iaf57371651296ac84850971ef60a9338cead57c0
* | | | | | | | am 93241de7: Merge "Remove a bitrotted test."Elliott Hughes2014-12-181-45/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: ba6982a * commit 'ba6982a16cb3b9f6196fdac11d1d90a02eb32cfd': Remove a bitrotted test.
| * | | | | | | Remove a bitrotted test.Elliott Hughes2014-12-171-45/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c44f2da0544dbfde8e340f7f477191725c5fb8b
* | | | | | | | am 05d455ca: am b9ccc047: Merge "Sanitize display names, keep extensions ↵Jeff Sharkey2014-12-011-0/+45
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intact." into lmp-mr1-dev * commit '05d455ca2b83793a81aac2544c388eec8ac140cd': Sanitize display names, keep extensions intact.
| * | | | | | | Sanitize display names, keep extensions intact.Jeff Sharkey2014-12-011-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating or renaming files on external storage, sanitize the requested display names to be valid FAT filenames. This also fixes a handful of directory traversal bugs. Also relax logic around generating display names to allow any extension which maps to the requested MIME type. Tests to verify. Bug: 18512473, 18504132 Change-Id: I89e632019ee145f53d9d9d2050932f8939a756af
* | | | | | | | am 3e5223fd: am 6829daa4: Merge "Add tests about annotations and enum."Yohann Roussel2014-12-018-1/+198
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '3e5223fd02d0f096ca50c964378c717adbb2e3e9': Add tests about annotations and enum.
| * | | | | | | Merge "Add tests about annotations and enum."Yohann Roussel2014-12-018-1/+198
| |\ \ \ \ \ \ \
| | * | | | | | | Add tests about annotations and enum.Yohann Roussel2014-11-208-1/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For reproduction of https://code.google.com/p/android/issues/detail?id=78144 Bug: 18385117 Change-Id: I23be53a0ae481a501d13adc8abf518ac664a772f
* | | | | | | | | am 6a53bd9d: am 69d28437: Merge "RRO tests: fix potential NPE"Conley Owens2014-11-261-2/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6a53bd9ddbff5dcccec3cd3928e10317007031d3': RRO tests: fix potential NPE
| * | | | | | | | Merge "RRO tests: fix potential NPE"Conley Owens2014-11-261-2/+6
| |\ \ \ \ \ \ \ \
| | * | | | | | | | RRO tests: fix potential NPEMårten Kongstad2014-11-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17765434 Check for null before closing streams. Change-Id: I651785649575725009f270d4d8eb5f4bf90952a6
* | | | | | | | | | am c657b302: am ed23786c: Merge "RRO tests: adapt tests to split apks"Conley Owens2014-11-261-8/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c657b302e5744e7de9ca142126ba3b428ce5a143': RRO tests: adapt tests to split apks
| * | | | | | | | | Merge "RRO tests: adapt tests to split apks"Conley Owens2014-11-261-8/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | RRO tests: adapt tests to split apksMårten Kongstad2014-11-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of support for split apks has resulted in the move of applications from /partition/app/pkg.apk to /partition/app/pkg/pkg.apk. Update the RRO testrunner to use the new paths. Bug: 17765434 Change-Id: I6eebfb6f879404077b9447c750ddc395ecd9a547
* | | | | | | | | am 54c11274: am c0491a2e: Merge "Lightweight checkin output for network ↵Jeff Sharkey2014-11-211-0/+34
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stats." into lmp-mr1-dev * commit '54c11274b5e7ce9f774f7c846d7165563279b96a': Lightweight checkin output for network stats.
| * | | | | | | | Lightweight checkin output for network stats.Jeff Sharkey2014-11-211-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define and print a compact version of network statistics when dump is requested with the "--checkin" flag. Defaults to last 24 hours, but included data can be tweaked with various flags. Groups together detailed network identities into larger umbrella terms like "mobile" and "wifi." Bug: 18415963 Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
* | | | | | | | | am 1d76d397: Merge "Fix wifi reconnection tests." into lmp-mr1-devEric Rowe2014-11-211-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: 3b442e2 * commit '3b442e23d859e84fe0550242257294c0b1e37438': Fix wifi reconnection tests.
| * | | | | | | | Fix wifi reconnection tests.Eric Rowe2014-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18417638 Change-Id: I1710e8b16d4ae1b32317deb0322a98ad45b4e1aa
* | | | | | | | | am 79de0066: Merge "Fix wifi tethering tests." into lmp-mr1-devEric Rowe2014-11-211-1/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerge: d2fd1bd * commit 'd2fd1bd9d631e822b03bfabd41853cc3075f61bf': Fix wifi tethering tests.
| * | | | | | | | Fix wifi tethering tests.Eric Rowe2014-11-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18418170 Change-Id: Ic3e8b74523c6a8b6003c05258447e9a673541248
* | | | | | | | | am 648f8106: am db3d76ab: Merge "Fix ParceledListSlice to enforce the same ↵Adam Lesinski2014-11-131-0/+263
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concrete types among its elements." into lmp-mr1-dev * commit '648f81064747b58be7ea9efab6d5744d6b49397a': Fix ParceledListSlice to enforce the same concrete types among its elements.
| * | | | | | | | Merge "Fix ParceledListSlice to enforce the same concrete types among its ↵Adam Lesinski2014-11-131-0/+263
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | elements." into lmp-mr1-dev
| | * | | | | | | | Fix ParceledListSlice to enforce the same concrete types among its elements.Adam Lesinski2014-11-121-0/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:17671747 Change-Id: I896f75738e5b464ccb6c03290f139cc2fa72f966
* | | | | | | | | | am a2781fda: am 521ca5f8: am 2e700004: am d68b87cd: Recover apps with ↵Jeff Sharkey2014-11-121-0/+57
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed certificates. * commit 'a2781fdac332c4f6277a986c88e34daa25a3b5f9': Recover apps with malformed certificates.
| * | | | | | | | | am 2e700004: am d68b87cd: Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+57
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | | * commit '2e7000040e3d836bb591e29515974817afc49488': Recover apps with malformed certificates.
| | * | | | | | | Recover apps with malformed certificates.Jeff Sharkey2014-11-121-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was a window of time in Lollipop where we persisted certificates after they had passed through a decode/encode cycle. The well-written OpenSSL library was liberal when decoding (allowing slightly malformed certs to be parsed), but then strict when encoding, giving us different bytes for effectively the same certificate. A related libcore change (0c990ab4a90b8a5492a67b2b728ac9a4a1ccfa1b) now returns the original bytes verbatim, fixing both pre-Lollipop installs and installs after that change. This change recovers any apps that had been installed during the window of time described above by doing a one-time check to see if the certs are effectively equal. Bug: 18228011 Change-Id: Ib82bd6db718d0490d7a26c9c1014b7c8457a7f2d