summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEBill Yi2018-03-087-16/+244
| | | | | Change-Id: I7aec2dd2fef708d122f214774a6e468c3b6ac4b4 Auto-generated-cl: translation import
* Import translations. DO NOT MERGE am: 0d53170142 -s oursBill Yi2018-03-070-0/+0
|\ | | | | | | | | | | am: cf1c57e611 -s ours Change-Id: I7dc2801cb622fc16ef510bb2966baf32e5432a5d
| * Import translations. DO NOT MERGEBill Yi2018-03-060-0/+0
|/| | | | | | | | | | | am: 0d53170142 -s ours Change-Id: Idbaa0d9be2b8ee00c8c197747466c1d9dfa4e7e2
| * Import translations. DO NOT MERGEBill Yi2018-03-064-0/+228
|/ | | | | Change-Id: I98b42d90f448f596fe848a6e8ea2ece741601b60 Auto-generated-cl: translation import
* Merge "packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where ↵Anton Hansson2018-03-015-0/+5
|\ | | | | | | | | | | | | | | possible." am: 8515a33c49 am: 2be155f869 am: da391ab7df Change-Id: Idba4a7c600d2c5afa8f5417325751289047c001d
| * Merge "packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where ↵Anton Hansson2018-03-015-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | possible." am: 8515a33c49 am: 2be155f869 Change-Id: Iade645fbc0f289ede05153c0b9ac0ddd2126caad
| | * Merge "packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where ↵Anton Hansson2018-03-015-0/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible." am: 8515a33c49 Change-Id: I332f5884537108cab37c127739cdb0e0d326e73b
| | | * Merge "packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where ↵Anton Hansson2018-03-015-0/+5
| | | |\ | | | | | | | | | | | | | | | possible."
| | | | * packages/providers/DownloadProvider: Set LOCAL_SDK_VERSION where possible.Anton Hansson2018-02-225-0/+5
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change sets LOCAL_SDK_VERSION for all packages where this is possible without breaking the build, and LOCAL_PRIVATE_PLATFORM_APIS := true otherwise. Setting one of these two will be made required soon, and this is a change in preparation for that. Not setting LOCAL_SDK_VERSION makes the app implicitly depend on the bootclasspath, which is often not required. This change effectively makes depending on private apis opt-in rather than opt-out. Test: make relevant packages Bug: 73535841 Change-Id: Ic2019b11a0dfb30b2dedb840011b365228e7786a
* | | | Import translations. DO NOT MERGEBill Yi2018-02-213-4/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: Icedff61e9b2ae19a408773f74272242303bba85c Auto-generated-cl: translation import
* | | | Import translations. DO NOT MERGE am: 6122b957f9 -s oursBill Yi2018-01-250-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | am: 0e76e18f3b -s ours Change-Id: I3b66de14394597d13907e63ab9158a195f712599
| * | | Import translations. DO NOT MERGEBill Yi2018-01-250-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | am: 6122b957f9 -s ours Change-Id: Ifa50299adbb75166c9d5235a451d6369c2f2caa4
| | * | | Import translations. DO NOT MERGEBill Yi2018-01-242-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I82d9ec3da1e2343054e09219a176063a6c666937
* | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2018-01-191-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBill Yi2018-01-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e5a7c62c099442063a934b5998a79271170c36f Auto-generated-cl: translation import
* | | | | | Merge "Add new no-op interface method." am: 726cb52790 am: 338dd4bda1Jeff Sharkey2018-01-191-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | am: 3a68c0ff91 Change-Id: If38cd52a3766aaadd43484ea1db58d74440b7428
| * | | | Merge "Add new no-op interface method." am: 726cb52790Jeff Sharkey2018-01-191-1/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | am: 338dd4bda1 Change-Id: I134823c02d99eda33e34864b7ec8be13127acc79
| | * | | Merge "Add new no-op interface method."Jeff Sharkey2018-01-191-1/+1
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | am: 726cb52790 Change-Id: Ib63b66fa86289b541e3e9430b9ad368badf42a54
| | | * | Merge "Add new no-op interface method."Jeff Sharkey2018-01-181-1/+1
| | | |\ \
| | | | * | Add new no-op interface method.Jeff Sharkey2018-01-181-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: bit FrameworksNetTests:android.net.,com.android.server.net. Test: bit FrameworksTelephonyTests:com.android.internal.telephony.dataconnection.DataConnectionTest Change-Id: Iebd6a6ad465f1b1d6678aefc3b146ea9bcd4b74e Exempt-From-Owner-Approval: trivial no-op overload Bug: 64133169
* | | | | Install in /system/priv-appJeff Vander Stoep2018-01-172-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DownloadProviderUi app is privileged because it runs in the same user (and same process) as other priv-apps such as the MediaProvider and gains all the privileges of that user. Mark it appropriately so that PackageManager scans it correctly. Bug: 71593002 Test: Build and flash Taimen. Verify that DownloadProviderUi is installed in /system/priv-app instead of /system/app. Change-Id: Ic3b45c7d38a49f6486f628429a24dd59f50a1cef
* | | | | Import translations. DO NOT MERGEBill Yi2018-01-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iebc068596fa6ef9833ac08e04a155c3859e823a7 Auto-generated-cl: translation import
* | | | | Import translations. DO NOT MERGE am: b2de5829f4 -s ours am: d76c021599 -s ↵Bill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours am: 5d247590e6 -s ours Change-Id: Ib638f66bd992fad2f5057638e86fcb1f2c09d954
| * | | | Import translations. DO NOT MERGE am: b2de5829f4 -s oursBill Yi2017-12-210-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | am: d76c021599 -s ours Change-Id: Ie558c746b3d2ecb2149fbc76860e31e35217f541
| | * | | Import translations. DO NOT MERGEBill Yi2017-12-200-0/+0
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: b2de5829f4 -s ours Change-Id: I869859ae99157976ad88ed584207f86524f6c0ff
| | | * | | Import translations. DO NOT MERGEBill Yi2017-12-1911-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ib675ee817fef21f8ef1cd3ce685f16594dbdde21
* | | | | | Import translations. DO NOT MERGE am: 10fdb7c626 -s oursBill Yi2017-12-210-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 328e87b938 -s ours Change-Id: I8ca349de477827442f5a1e8755bc55b58b0e04ae
| * | | | | Import translations. DO NOT MERGEBill Yi2017-12-210-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 10fdb7c626 -s ours Change-Id: Iee56b318178bf95a49dc925aa3f86dea9aeeed91
| | * | | | Import translations. DO NOT MERGEBill Yi2017-12-1911-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 64712476 Change-Id: I437a44c67f6181e499b01c0f173b761344789b33
* | | | | | Import translations. DO NOT MERGEBill Yi2017-12-195-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibeda11d543f3e4e1545b01060893c110f4161d0c Auto-generated-cl: translation import
* | | | | | Stop statically including legacy-android-testPaul Duffin2017-12-083-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Statically including legacy-android-test leads to duplicate classes which causes build time problems (with Proguard) and runtime problems on older SDK versions. This change: * Stops statically including legacy-android-test. * Adds compile time dependencies on andoid.test.base, android.test.mock and android.test.runner where necessary. * Adds <uses-library android:name="android.test.runner"/> to any affected package to ensure that the classes that were included by legacy-android-test are still available at runtime. That also adds a dependency on android.test.base and android.test.mock. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * tests/Android.mk Added 'android.test.base' and 'android.test.mock' to LOCAL_JAVA_LIBRARIES because DownloadProviderTests's source depends on their classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in DownloadProviderTests results in duplicate classes which leads to build time and compile time issues. * tests/permission/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because DownloadProviderPermissionTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in DownloadProviderPermissionTests results in duplicate classes which leads to build time and compile time issues. * tests/public_api_access/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because DownloadPublicApiAccessTests's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in DownloadPublicApiAccessTests results in duplicate classes which leads to build time and compile time issues. Bug: 30188076 Test: make checkbuild Change-Id: I5120c8944fee3cf34e375ffbe988c12771d6cff2
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-12-081-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2017-12-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I22c8d694343c2fef0ce3d33a2c42e9fa34ca55f7 Auto-generated-cl: translation import
* | | | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 1612384184 -s ours am: ↵Xin Li2017-12-080-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 8da751444a am: 64a1f6575b -s ours Change-Id: I8a44e6bf69a87d783fb9ea6730a909e572a5d009
| * | | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 1612384184 -s oursXin Li2017-12-070-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | am: 8da751444a Change-Id: I74717416b7d873dc426eabbbee2d0eca596e98c2
| | * | | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-070-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | am: 1612384184 -s ours Change-Id: Ibd4785d8efee315c8d524a1a97590fe75801ea78
| | | * | | Merge "DO NOT MERGE: Merge Oreo MR1 into master"Xin Li2017-12-0623-529/+71
| | | |\ \ \
* | | | | | | Manually merge changes from giant AOSP topicStephen Li2017-12-070-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I780fb1e3adeb037fa64429f3f5e4343c72143409
| * | | | | | DO NOT MERGE: Merge Oreo MR1 into master am: 799550d577 -s oursXin Li2017-12-070-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 2be6a6ec65 Change-Id: I791589e427c12239e7f45b8ac80671a7a69370b5
| | * | | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-070-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | am: 799550d577 -s ours Change-Id: I2ef249b505fdd462c3f0125998d1b2fe1c74e3f8
| | | * | | | DO NOT MERGE: Merge Oreo MR1 into masterXin Li2017-12-0623-529/+71
| | | |\ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | | | | | | Exempt-From-Owner-Approval: Changes already landed internally Change-Id: Ie9c6ce7cbe644e94a16e183d1d9d59cd1a3554f2
* | | | | | Import translations. DO NOT MERGEBill Yi2017-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie86fe6c1bfa878299b402a7ad4f68dbf44fa22b3 Auto-generated-cl: translation import
* | | | | | Import translations. DO NOT MERGE am: 4acb87f8a9 -s oursBill Yi2017-11-300-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 3daaccce52 -s ours Change-Id: I493cb768089c8f0b98301a9b9ee4a3f34b2662e7
| * | | | | Import translations. DO NOT MERGEBill Yi2017-11-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 4acb87f8a9 -s ours Change-Id: Ib6f97993d2063bb27c481527484a97b1e7650eac
| | * | | | Import translations. DO NOT MERGEBill Yi2017-11-309-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 69925163 Change-Id: Ie75b41da80ba6e9646bd16196b8e0a79da6bb060
* | | | | | Import translations. DO NOT MERGEBill Yi2017-11-263-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7170e7533d540ff294a5fb02357e530a7f9d22bd Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"TreeHugger Robot2017-11-151-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBill Yi2017-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I533d81e1c1a55f6581f893d9762af493ddb62e62 Auto-generated-cl: translation import
* | | | | | | Merge commit '41d0a16cea165552092b2bf8988b9855dea14fde' from ↵Xin Li2017-11-150-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master am: f17b4363fd -s ours am: e6dee4851b -s ours Change-Id: I75c702ba8cf0f59f51f899dc771a90aa2a163706
| * | | | | Merge commit '41d0a16cea165552092b2bf8988b9855dea14fde' from ↵Xin Li2017-11-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | oc-mr1-dev-plus-aosp-without-vendor into stage-aosp-master am: f17b4363fd -s ours Change-Id: I776ff8a1f09a4dcba4c26a472506e10fbebeda42
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 07:58:19 +0000