summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-11-09Snap for 9271768 from be6ea7c85b0aba8fad15e457904f1c2619fabd1f to ↵aml_sdk_331812000aml_sdk_331811100aml_sdk_331811000aml_sdk_331412000aml_sdk_331410000aml_sdk_331310010android13-mainline-sdkext-releaseAndroid Build Coastguard Worker
mainline-sdkext-release Change-Id: I024cf67e27c24204fd8165413ef6ed745e546954
2022-09-28Enable shrinking optimization of service-media-sZhi Dou
This change enables R8 code shrinking with R8 full mode of system server jar service-media-s. The optimization settings are set through inheriting "framework-system-server-module-optimize-defaults", which is the common optimization settings for all mainline module system server jar. All classes extending SystemServer, and classes/methods/fileds annotated with @SystemApi and @Keep will be considered as optimization entries. entries unreachable code will be removed. Current this change removes com.android.server.media.SessionPriorityList: private static final java.lang.String TAG public com.android.server.media.MediaCommunicationService$Session2Record getMediaButtonSession() public com.android.server.media.MediaCommunicationService$Session2Record getMediaVolumeSession() The size of service-media-s reduces by 16%, from 23434B to 19594B. Test: presubmit and mts-tradefed run mts-media, and there is no failed tests after applying this change. Bug: 247779319 Change-Id: I10035f7f894a84e5fa8a32a3291eccf27b1b0033
2022-09-12Snap for 9051867 from fba8c8eee9c0aed23eed6ae1bacc854fdccf634d to ↵aml_sdk_331111000Android Build Coastguard Worker
mainline-sdkext-release Change-Id: I061b0ec4d3de49da18ddbbedadfa504765dc8d90
2022-07-19Added visibility needed for the S snapshot am: d1f3cb3edbPaul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/19289813 Change-Id: I8ab1905de49456d0b3ef047b2419c8408d9afbd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-15Added visibility needed for the S snapshotPaul Duffin
Change http://ag/16848803 moved the service-media-s module from frameworks/base/apex/media/service to packages/modules/Media/apex/service and change http://ag/18030544 removed a dependency from service-media-s onto updatable-media. As a result of that work "//frameworks/base/apex/media/service" and "//frameworks/base" were removed from updatable-media's visibility. Unfortunately, an sdk snapshot generated after that change will not work in S because it still has dependencies from frameworks/base/.. onto updatable-media but the latter has no matching visibility rules. This change adds the visibility back along with a message explaining why it is needed and cannot be removed. Bug: 239121291 Test: m media-module-sdk # Check that it has the missing visibility. Change-Id: I024986c60f2b932565b4d189f83e25ec80bedced
2022-07-15Dedup *fragments information common to apex and sdkPaul Duffin
Previously, both the sdk and apex had to specify the same *fragments property to ensure that building a system image from a prebuilt version of the module (both APEX and sdk snapshots) would work. This change avoids the duplication by adding the apex to the sdk which allows the sdk to automatically export any APIs and related information provided by the APEX. At the moment that just includes information from *fragments properties but may expand in future. This also removes framework-media from the java_sdk_libs property of the sdk as that module is listed in the APIs of com.android.media-bootclasspath-fragment and so is automatically added to the sdk when the fragment is added. Bug: 232401814 Test: # Build snapshots with a fixed build number BUILD_NUMBER=fixed packages/modules/common/build/mainline_modules_sdks.sh # Remove api diff files as they contain file stamps of generated files so # differ every time they are generated. find out/dist/mainline-sdks -name \*txt | xargs rm # Save the snapshots away. mv out/dist/mainline-sdks before-changes # Apply this change. # Repeat the first two steps above and then run the following to verify # that this change had no effect on the generated snapshot contents. meld before-changes out/dist/mainline-sdks Change-Id: I83952c087db24a978729f4cff5d2f2cc203ec38f (cherry picked from commit 26479648b9342845863628bb86afb2c7edef31ad) Merged-In: I83952c087db24a978729f4cff5d2f2cc203ec38f
2022-04-29Stop framework-media from being api_only am: 3894454009aml_wif_330910030aml_wif_330810040aml_tet_330911010aml_tet_330812150aml_sta_330910000aml_sdk_330810050aml_sdk_330810010aml_res_330910000aml_res_330810000aml_per_330912010aml_per_330811030aml_net_330910010aml_net_330811010aml_mpr_330911040aml_mpr_330811020aml_cbr_330911010aml_cbr_330810000Paul Duffin
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/18030544 Change-Id: Id5e02c3cfcfe6bba41a6f787bf1d5f610e1ca0ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28Stop framework-media from being api_onlyt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devPaul Duffin
Removes the api_only: true property and adds the necessary properties needed to compile the implementation library. It also stops updatable-media from building from source and instead makes it statically include framework-media.impl. Bug: 190807367 Bug: 229932396 Test: m com.android.media media-module-sdk # Compare before and after this change. Change-Id: Ic34b29399f20a04921f697f6a92cc6c82003bb10
2022-04-01Reorganize exoplayer target names am: 4821bbdbadSantiago Seifert
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/17523089 Change-Id: Id8c4b45972c4bd6fe4acc57ec75739aa654fd08c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31Reorganize exoplayer target namesSantiago Seifert
Bug: 223572414 Test: m Change-Id: I6133af185a7c99aed56b34b9ade70b5a00c2579b Merged-In: I6133af185a7c99aed56b34b9ade70b5a00c2579b
2022-03-31Adjust javadoc am: ea572ddc73Kyunglyul Hyun
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/17472926 Change-Id: I029e265970189a0425498da5720552cb77f17efe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30Adjust javadocKyunglyul Hyun
Bug: 217742394 Test: N/A Change-Id: If6ec87593dcc6a43b10df81b64b8700d64bce684
2022-03-18Add comment to MCM#dispatchKeyEvent am: be55ac472cKyunglyul Hyun
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/17231287 Change-Id: Ib71160dca62de55b754c33b294fe293f7d02648d
2022-03-17Add comment to MCM#dispatchKeyEventKyunglyul Hyun
Resolving API review Bug: 217742394 Test: N/A Change-Id: I54a1caf608dc6746259a00ba5b2a2c89c9f90d4e
2022-03-09[automerger skipped] Fold in MinSdk/RequiresApi for mainline newapi lint am: ↵Ray Essick
ba3a45dde5 am: 9354ab107b am: cc95bbf27a -s ours am: 2ec5140a84 -s ours am skip reason: Merged-In I5eabe631ff441ea3af85b2664b6a57647e1a684e with SHA-1 8060b2a78a is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2015915 Change-Id: Id0616b09ad0ad8b3a9f00f95425f65cc5863395b
2022-03-09[automerger skipped] Merge Android 12L am: df19fdfd7f -s ours am: b7caaa978f ↵Xin Li
-s ours am: a37c729d81 -s ours am: 30be45dea6 -s ours am skip reason: Merged-In I9aca5de72f7205ce7243e19acad1234604b5a6f9 with SHA-1 4a9d6729d3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2012831 Change-Id: Ia539b73ac436d40841733828b1e413e607a0c3f8
2022-03-09[automerger skipped] Fold in MinSdk/RequiresApi for mainline newapi lint am: ↵Ray Essick
ba3a45dde5 am: 9354ab107b am: cc95bbf27a -s ours am skip reason: Merged-In I5eabe631ff441ea3af85b2664b6a57647e1a684e with SHA-1 8060b2a78a is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2015915 Change-Id: I7d9ba43c9d150b57631212c0ccc42a320c378ee2
2022-03-09[automerger skipped] Merge Android 12L am: df19fdfd7f -s ours am: b7caaa978f ↵Xin Li
-s ours am: a37c729d81 -s ours am skip reason: Merged-In I9aca5de72f7205ce7243e19acad1234604b5a6f9 with SHA-1 4a9d6729d3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2012831 Change-Id: I92212cae65041da4cf3e281aa86b157828311203
2022-03-09Fold in MinSdk/RequiresApi for mainline newapi lint am: ba3a45dde5 am: ↵Ray Essick
9354ab107b Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2015915 Change-Id: I4f96029dcb9bc8c58c5670331f1370a38fb0c744
2022-03-08Fold in MinSdk/RequiresApi for mainline newapi lint am: ba3a45dde5Ray Essick
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2015915 Change-Id: I270b64b970adf0dab5ed978b5a950589d9c593c2
2022-03-08Fold in MinSdk/RequiresApi for mainline newapi lintRay Essick
The fixes are present internally, this is for AOSP Test: build Bug: 223375505 Fixed: 223375505 Merged-In: I5eabe631ff441ea3af85b2664b6a57647e1a684e Change-Id: I14a74b03da2036e54260e6338cee735007c99bba
2022-03-08[automerger skipped] Merge Android 12L am: df19fdfd7f -s ours am: b7caaa978f ↵Xin Li
-s ours am skip reason: Merged-In I9aca5de72f7205ce7243e19acad1234604b5a6f9 with SHA-1 4a9d6729d3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2012831 Change-Id: I5f6ad6df952c40509e4046fd468538054ab29456
2022-03-08[automerger skipped] Merge Android 12L am: df19fdfd7f -s oursXin Li
am skip reason: Merged-In I9aca5de72f7205ce7243e19acad1234604b5a6f9 with SHA-1 4a9d6729d3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2012831 Change-Id: I6e5afe94b2a87d0607b09cec28dbb127e015c9b5
2022-03-08Merge Android 12LXin Li
Bug: 222710654 Merged-In: I9aca5de72f7205ce7243e19acad1234604b5a6f9 Change-Id: I3298829d1c53bdb7bd53f24a0acf617ac9aaba25
2022-03-03Fix BaseMediaParceledListSlice unparceling am: 8060b2a78aOliver Woodman
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/17044803 Change-Id: Ia5118896ae0aa7bf48d8b05b52f634c5cd6d6014
2022-03-01Fix BaseMediaParceledListSlice unparcelingOliver Woodman
Test: atest CtsMediaMiscTestCases:android.media.misc.cts.MediaCommunicationManagerTest#testManagerSessionCallback Bug: 221634829 Change-Id: I5eabe631ff441ea3af85b2664b6a57647e1a684e
2022-02-18[automerger skipped] DO NOT MERGE - Fold in MinSdk/RequiresApi for mainline ↵Ray Essick
newapi lint am: 63e46b7f3a -s ours am: 4a9d6729d3 -s ours am: e4bb3d12b3 -s ours am: eaaa518da9 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/1991450 Change-Id: I7dc5d217fe6a61c3d86c2de8733e1f80d1eb88b1
2022-02-18[automerger skipped] DO NOT MERGE - Fold in MinSdk/RequiresApi for mainline ↵Ray Essick
newapi lint am: 63e46b7f3a -s ours am: 4a9d6729d3 -s ours am: e4bb3d12b3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/1991450 Change-Id: Ibcee8f5cac81d74e899c4ecf91c01b6ed84d9ef8
2022-02-18[automerger skipped] DO NOT MERGE - Fold in MinSdk/RequiresApi for mainline ↵Ray Essick
newapi lint am: 63e46b7f3a -s ours am: 4a9d6729d3 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/1991450 Change-Id: I8ba5b461f0eb3ec9c57f58a59fb1968a7dab82bd
2022-02-18[automerger skipped] DO NOT MERGE - Fold in MinSdk/RequiresApi for mainline ↵sam_222710654Ray Essick
newapi lint am: 63e46b7f3a -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/1991450 Change-Id: I9aca5de72f7205ce7243e19acad1234604b5a6f9
2022-02-18DO NOT MERGE - Fold in MinSdk/RequiresApi for mainline newapi lintplatform-tools-33.0.1Ray Essick
The fixes are present internally, this is for AOSP Test: build Merged-In: Ice516a0ab0819c4a076c394c05be1643461d4309 Change-Id: Ia46943f9c667a4066cd1725028c2d8823deacea3
2022-02-16Merge "Prepare to extract apex/media to packages/modules/Media" am: ↵Baligh Uddin
c6bdeea3cf am: e399943499 am: f7340efd88 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168 Change-Id: I99c86dcc99d61a059cd4475f0d737ad5d0b5b3f5
2022-02-16Merge "Prepare to extract apex/media to packages/modules/Media" am: ↵Baligh Uddin
c6bdeea3cf am: e399943499 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168 Change-Id: Ide35841d9a14fbd1726a19c12c50067bb9d4c4cf
2022-02-16Merge "Prepare to extract apex/media to packages/modules/Media" am: c6bdeea3cfBaligh Uddin
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1987168 Change-Id: I1b902c5c2cae17ad2002e0275026746a4c84a737
2022-02-16Prepare to extract apex/media to packages/modules/MediaBaligh Uddin
- Use Android-Apache-2.0 as default license. - Adding visibility to non-existing path is there for post-migration path [ which currently does not exist ] -- it is not a build error to add non-existent paths to visibility. BUG: 171106157 Test: Local build and TH Change-Id: I4adea9da4df8f6ae51b9849dfd6a30bf22e28637
2022-02-15[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master ↵Xin Li
am: 5409ef1ab7 -s ours am: ca0f6265db -s ours am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c5358 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16870369 Change-Id: I161aaec86e2c2b2a9e60d4022e3ee09d5307e9dc
2022-02-15[automerger skipped] Merge "Merge SP2A.220305.012" into stage-aosp-master ↵Xin Li
am: 5409ef1ab7 -s ours am skip reason: Merged-In I748fdd49626acaa0e986a9d8038039cada6faa60 with SHA-1 8f368c5358 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16870369 Change-Id: I16e893fc953d656d5af2f2c8a5351128ba06918d
2022-02-14Merge SP2A.220305.012Xin Li
Bug: 219523960 Merged-In: I748fdd49626acaa0e986a9d8038039cada6faa60 Change-Id: I67693156d705f2488fe18149d2dd02d529f009ff
2022-02-14Merge "[automerger skipped] Merge "Merge ↵Automerger Merge Worker
sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1be -s ours" into sc-v2-dev-plus-aosp am: 22e34be259 -s ours am skip reason: Merged-In I8cfa435bb6233818adb9cc99dadeeb06a03443d5 with SHA-1 0ca70fff40 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16845294 Change-Id: Ie1202f6636c0b6417c48dee03be3ef3a3ec3faa5
2022-02-14[automerger skipped] Merge "Merge ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master am: a6a261b1be -s ours am skip reason: Merged-In I8cfa435bb6233818adb9cc99dadeeb06a03443d5 with SHA-1 0ca70fff40 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16845294 Change-Id: I2bfcd06308c70f33b89c01a4164e92bd084e0ec4
2022-02-11Merge sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I8cfa435bb6233818adb9cc99dadeeb06a03443d5 Change-Id: Ib93992d88fd1704179009a3872798b9e7b83a6d1
2022-02-07[automerger skipped] Merge "Auto-generate list of module impl jars" am: ↵Anton Hansson
9a4e4e9156 am: d5da9cee26 am: c7eb51f46e am: 12e3a0001b -s ours am skip reason: Merged-In Ia8627c6e3977cd271e389ec482388ff73661881d with SHA-1 65364a035f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972644 Change-Id: I218737c835ccc67bc9ef26fd94e405f248a91f12
2022-02-07Merge "Auto-generate list of module impl jars" am: 9a4e4e9156 am: d5da9cee26 ↵Anton Hansson
am: c7eb51f46e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972644 Change-Id: If422ee2663d06d334ba4638f41ecc5def38b343b
2022-02-07Merge "Auto-generate list of module impl jars" am: 9a4e4e9156 am: d5da9cee26Anton Hansson
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1972644 Change-Id: I911ac4c1b54d089f202a8c2fa76ad0af99c3b5e7
2022-02-04Auto-generate list of module impl jarsAnton Hansson
Eliminate another duplicated list of all modules. This one has a couple of workarounds due to different naming of impl libs, and bluetooth not being ready. Bug: 169103987 Test: m framework-all and diff intermediates (no diffs) Merged-In: Ia8627c6e3977cd271e389ec482388ff73661881d Change-Id: Ia8627c6e3977cd271e389ec482388ff73661881d
2022-02-04Auto-generate list of module impl jarsAnton Hansson
Eliminate another duplicated list of all modules. This one has a couple of workarounds due to different naming of impl libs, and bluetooth not being ready. Bug: 169103987 Test: m framework-all and diff intermediates (no diffs) Change-Id: Ia8627c6e3977cd271e389ec482388ff73661881d
2022-01-30enable strict_updatability_lintingRay Essick
now that the directory and lint-baseline.xml are both clean. Bug: 188851874 Test: build, boot Change-Id: I15bf770dc7d955a615553cf1cc3494450bcc0c2c
2022-01-29cleanup for strict_updatability_lintingRay Essick
add extra annotations, reset lint-baseline.xml files. The lint-baseline.xml includes code fixes from 2021/11 that had no xml regeneration. XML files updated with output from the test make commands. Bug: 188851874 Test: build Test: m out/soong/.intermediates/frameworks/base/apex/media/framework/updatable-media/android_common_apex29/lint/lint-baseline.xml Test: m out/soong/.intermediates/frameworks/base/apex/media/service/service-media-s/android_common_apex29/lint/lint-baseline.xml Change-Id: Iad4d811d4d04dd9901d7290d1342e3aae2c22499
2022-01-20MediaSession2Service: Doc notification permissionOliver Woodman
Test: Javadoc only Bug: 209461524 Change-Id: I3a0041d6bebcedd0528801fdd37d94230a273479
2022-01-13Merge "Revert "Make MediaParser depend on the latest Exo version""TreeHugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 09:22:48 +0000