summaryrefslogtreecommitdiffstats
path: root/core/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Support for nested bundles in setApplicationRestrictionsFyodor Kupolov2015-03-304-0/+139
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new restriction types - bundle and bundle-array. Modified RestrictionsManager.getManifestRestrictions to support new hierarchical restrictions. Added RestrictionsManager.convertRestrictionsToBundle, which enables programmatic conversion from a list of RestrictionEntries to a Bundle. Modified read/write methods for application restrictions in UserManagerService. Added unit tests. Bug: 19540606 Change-Id: I32b264e04d5d177ea5b4c39a8ace5ee0ce907970
* | | Keep debug information in NetworkStats filesWenchao Tong2015-03-271-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create two special SETs. SET_DBG_VPN_IN is used by individual applications to know how much traffic of the NetworkIdentity was actually moved from a VPN app. SET_DBG_VPN_OUT is used by the VPN app to know how much traffic of the NetworkIdentity was deducted. A debug application can restore the raw stats by these entries. raw_traffic = recorded_entry (TAG_NONE, SET_ALL) + recorded_entry (TAG_NONE, SET_DBF_VPN_OUT) - recorded_entry (TAG_NONE, SET_DBF_VPN_IN) The two debug SETs are not returned by NetworkStatsService.openSession(). These debug entries are retrieved by NetworkStatsCollection.dump(). Bug: 19536273 Change-Id: I03ef9f7667f5f2f48cbe3f6b11447fe7ead8ad3b
* | | Merge "Create a Benchmark test for NetworkStats."Wenchao Tong2015-03-271-0/+82
|\ \ \
| * | | Create a Benchmark test for NetworkStats.Wenchao Tong2015-03-231-0/+82
| | | | | | | | | | | | | | | | | | | | Bug: 19536273 Change-Id: I438ed3affa799612566b04e324e43bc5ea74079f
* | | | Load libraries directly from apkDmitriy Ivanov2015-03-217-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 Change-Id: I1aa2c039bb2a590ae72f256acc9ba5401c2c59b1
* | | | Add two utility methods for IPv4 netmasks.Lorenzo Colitti2015-03-201-0/+70
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 1. Add a validating method to convert a netmask to a prefix length. 2. Add a function to get the implicit netmask of an IPv4 address. 3. Add a unit test. Bug: 19704592 Change-Id: Icb9f58d3903ea01df9e3720383c9bd5db6dd8f26
* | | Merge "NetworkStats to support VPN accounting."Wenchao Tong2015-03-121-0/+67
|\ \ \
| * | | NetworkStats to support VPN accounting.Wenchao Tong2015-03-091-0/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a new method to migrate underlying network traffic from VPN app to other apps. Bug: 19536273 Change-Id: I3434cad361592e26b01225edf8012f7b16afc98f
* | | | Fix handling of LOCAL_JACK_ENABLEDYohann Roussel2015-02-236-25/+51
|/ / / | | | | | | | | | Change-Id: I5180aa6b685859b7855d0037f38178e906e21bd3
* | | Normalize deprecated 2-letter language code when necessary.Yohei Yukawa2015-02-211-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for I7d932e60311b80c05be8f02c9e803f18da0e0054, which revealed that we could not use deprecated 2-letter code like "in" to query subtype which has new language codes like "id". This CL addresses the above issue by normalizing the language code with Locale#Locale(String, String) before comparing one to another. Change-Id: I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10
* | | Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0Yohei Yukawa2015-02-201-32/+488
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds several unit tests for following CLs, both of which enabled InputMethodUtils (and dependent IMF logic) to handle 3 letter language codes and conversion from deprecated two-letter codes to new ones correctly. - Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c - I6571d464a46453934f0a8f5e79018a67a9a3c845 As described in tests, the input method framework has already been able to recognize 3 letter language codes. However, there remain inconsistencies when we use deprecated 2-letter code to query subtype like "in" but the subtype has new language codes like "id". Subsequent CLs are supposed to address remaining issues. bug: 10090157 Change-Id: I7d932e60311b80c05be8f02c9e803f18da0e0054
* | | Merge "RegisteredServicesCache now saves files to a user-specific dir"Fyodor Kupolov2015-02-131-54/+148
|\ \ \
| * | | RegisteredServicesCache now saves files to a user-specific dirFyodor Kupolov2015-02-121-54/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, its state was saved in a single xml file inside /data/system/registered_services. Services are now stored in separate files stored in a user-specific dir. A one-off migration step was added, which runs, when the system discovers a file in the old format. Bug:19321135 Change-Id: Ie92be01047f4855d01352b6a304820b37344ae2c
* | | | Merge "Move apache specific portions of android.net.http to ↵Narayan Kamath2015-02-134-3/+5
|\ \ \ \ | |/ / / |/| | | | | | | external/apache-http."
| * | | Move apache specific portions of android.net.http to external/apache-http.Narayan Kamath2015-02-124-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 33d3c53d: resolved conflicts for merge of 517e0274 to lmp-mr1-dev-plus-aospAlex Klyubin2015-02-111-5/+6
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '33d3c53da021f0d044028860ace0f4ad817273f5': Move hidden ApplicationInfo flags into a separate field.
| * | 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
* | | | Added unit test for RegisteredServicesCacheFyodor Kupolov2015-02-101-0/+283
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor refactoring of RegisteredServicesCache for testability. Added RegisteredServicesCacheTest which uses a mock version of RegisteredServicesCache. Bug:19321135 Change-Id: If18b794b28f03b4bf4bbdfbba9e9a57e808aaebf
* | | | Merge "Adapt to change of LOCAL_USE_JACK values"Yohann Roussel2015-02-056-8/+24
|\ \ \ \
| * | | | Adapt to change of LOCAL_USE_JACK valuesYohann Roussel2015-02-056-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also remove depency to the dx main dex list when building with Jack. Change-Id: I13e45dc8406a6a71309d151bf1542b1296c17792
* | | | | am b43e74bb: am 12b26c12: am 21702263: Merge "Add a unit test for ↵Lorenzo Colitti2015-02-051-0/+225
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | StaticIpConfiguration." * commit 'b43e74bbce46f2f328e2031a7ae3447f415ef9ca': Add a unit test for StaticIpConfiguration.
| * | | 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 automerge: ff526fa * commit 'ff526fa7106fd45bfc4f1606fe051000c5201920': Fix build breakage in older branches by avoiding <> notation
| * | | 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
* | | | | | | | | Remove dead code #11: Remove more unused classesJorim Jaggi2015-01-2715-1118/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
* | | | | | | | | Revert "Remove dead code #11: Remove more unused classes"Jorim Jaggi2015-01-2715-0/+1118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 397ca8be8de407237cd293873647c182837bc032. Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1 Reason: Build breakage.
* | | | | | | | | Remove dead code #11: Remove more unused classesJorim Jaggi2015-01-2115-1118/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3130991cb468a47aa0e198e42f20edca0836f66b
* | | | | | | | | Merge "New trick to install bad dex file."Ying Wang2015-01-201-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New trick to install bad dex file.Ying Wang2015-01-141-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. Bug: 18837479 Change-Id: I73f82c8a15e1d8935d9c2f290ba9456184a56ec7
* | | | | | | | | | am b3f73dc5: am b55011e4: am f9c04f17: Merge "Removing HttpResponseCacheTest"Neil Fuller2015-01-161-139/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | * commit 'b3f73dc5179532d587f743a9831faff3584c7c5b': Removing HttpResponseCacheTest
| * | | | | | | | 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
* | | | | | | | | Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.Neil Fuller2015-01-121-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. (cherry-picked from commit 62d0677b0f6cc5ae48fd0b816ea5caad82264fd6) Change-Id: Ibe698a443ec98866787ed9da2698322fab856518