)]}' { "log": [ { "commit": "3ffdb886efb9f23dcd8c888ed34675b64aeba9c7", "tree": "db140f35199c7df9bf14f066f487d5d6ddcf3171", "parents": [ "6b7c07b0323964305100fc04b106a969d9bd1edb", "ab2492bfc97e90902c831ebf83cc8355d92aad4f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:58 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:58 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I34ec42becbbbc4b1e02013c571ece3e49e44bf3f\nChange-Id: I081b209ebcbb595b1c763b1237a4ae23b00a16f2\n" }, { "commit": "ab2492bfc97e90902c831ebf83cc8355d92aad4f", "tree": "db140f35199c7df9bf14f066f487d5d6ddcf3171", "parents": [ "a473f3ba7036864927b347e2f94dd5bfa79ad406", "6b7c07b0323964305100fc04b106a969d9bd1edb" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Fri Feb 28 06:36:49 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 28 06:36:49 2025 -0800" }, "message": "[owners] Remove lnilsson@google.com from apex/OWNERS am: 6b7c07b032\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3514617\n\nChange-Id: I982da78f719b138113c61a31b26c74abcf5dc069\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6b7c07b0323964305100fc04b106a969d9bd1edb", "tree": "4e8f6c0d71faebe16e204baaf5a65bb2471b92b4", "parents": [ "41e90a2e5e30eaeba44d2748518a9f6271bf452a" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Feb 27 17:14:45 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Feb 27 17:14:48 2025 -0800" }, "message": "[owners] Remove lnilsson@google.com from apex/OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/lnilsson@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: Ie532ed0596e257071db43b95be2d84c4f9d2e661\n" }, { "commit": "a473f3ba7036864927b347e2f94dd5bfa79ad406", "tree": "a6556db82a6ca044ffd165eff7004be32e328482", "parents": [ "d3d0383753ea7e52647f849b75054d19861e6838", "7b1f30a6da1b4aa303ba1488b790bebc5d5dfeab" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:25:26 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:25:26 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "d3d0383753ea7e52647f849b75054d19861e6838", "tree": "c369ffc5fb3cad73b53ef8d3eaa91d6da8836953", "parents": [ "c08603d307e8ec01373265ced91a1b0f1ddbc237", "41e90a2e5e30eaeba44d2748518a9f6271bf452a" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Wed Feb 26 12:23:43 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 26 12:23:43 2025 -0800" }, "message": "[owners] Remove jinpark@google.com from apex/OWNERS am: 41e90a2e5e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3506539\n\nChange-Id: Ic30c9826980f058604062faf5fe409936c7e987d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "41e90a2e5e30eaeba44d2748518a9f6271bf452a", "tree": "c369ffc5fb3cad73b53ef8d3eaa91d6da8836953", "parents": [ "232b087047c8d5dc8630e601860a1e2a984880e7" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Feb 24 15:44:52 2025 -0800" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Mon Feb 24 15:44:55 2025 -0800" }, "message": "[owners] Remove jinpark@google.com from apex/OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\n\nPlease approve this change and vote the highest CR. This will keep the OWNERs\nfile tidy. We ask that you do not ignore this change and approve it\nunless you know a reason the OWNER should remain. It can always be\nreverted if needed.\n\nIf this change is in error, vote the lowest CR value (i.e. reject the CL)\nand the bot will abandon it.\n\nSee the owner\u0027s recent review activity for context:\nhttps://android-review.googlesource.com/q/jinpark@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: I463d788f5360ac84ce68d1ce4f9d348b1177eb34\n" }, { "commit": "7b1f30a6da1b4aa303ba1488b790bebc5d5dfeab", "tree": "6d0dff4de2b42d24e095d99eea3d3f024415bcfd", "parents": [ "c08603d307e8ec01373265ced91a1b0f1ddbc237", "287aa4e574527194425000c2593f342ccaa6cf59" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:20 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Feb 10 14:08:20 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I2c43b6b15162295c8f74bc1a2f2142869803a16e\nChange-Id: I97423b6719b2cd9102b30dad6bdd5de4f21c3cd0\n" }, { "commit": "c08603d307e8ec01373265ced91a1b0f1ddbc237", "tree": "eaa8aa7cc4b0632e867e811ec6e8736229c7c566", "parents": [ "d4ac74d39b4fd83f9e859d8234399592b810fbcf", "232b087047c8d5dc8630e601860a1e2a984880e7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 05 07:30:17 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 07:30:17 2025 -0800" }, "message": "Merge \"Update media2 session references to media3 in framework docs\" into main am: 232b087047\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3476232\n\nChange-Id: Id9217abb68c24dc405babcafe50fd5ef1900058f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d4ac74d39b4fd83f9e859d8234399592b810fbcf", "tree": "45f2a5ffb13f69eda12045ef631df5f2a097a359", "parents": [ "4dd4e16066d51555fef0ef8866258f8ee1cf1a7b", "f2925582c06a266ad2067ef098b8733c5d6aaab6" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Wed Feb 05 07:30:04 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 05 07:30:04 2025 -0800" }, "message": "Explicitly set proguard_compatibility for updatable-media am: f2925582c0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3457579\n\nChange-Id: I2c53af7db886926de0f94a78d1a6aebdd3499d68\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "232b087047c8d5dc8630e601860a1e2a984880e7", "tree": "eaa8aa7cc4b0632e867e811ec6e8736229c7c566", "parents": [ "f2925582c06a266ad2067ef098b8733c5d6aaab6", "bc3cccf2af6a8f35081f4db32fdb98d43d11df2e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Feb 05 07:22:43 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 05 07:22:43 2025 -0800" }, "message": "Merge \"Update media2 session references to media3 in framework docs\" into main" }, { "commit": "bc3cccf2af6a8f35081f4db32fdb98d43d11df2e", "tree": "f7ab13be3626daa5fa1b69849ff64bfe747620d7", "parents": [ "4dd4e16066d51555fef0ef8866258f8ee1cf1a7b" ], "author": { "name": "Ian Baker", "email": "ibaker@google.com", "time": "Tue Feb 04 08:45:56 2025 -0800" }, "committer": { "name": "Marc Bächinger", "email": "bachinger@google.com", "time": "Wed Feb 05 05:05:37 2025 -0800" }, "message": "Update media2 session references to media3 in framework docs\n\nThe androidx.media2 library is deprecated, and the source has been deleted.\n\nBug: 324249307\nTest: Presubmit (javadoc only change)\n\nChange-Id: Ifb3f809578be8edd678ea0aacde0254b22db8ffe\n" }, { "commit": "f2925582c06a266ad2067ef098b8733c5d6aaab6", "tree": "45f2a5ffb13f69eda12045ef631df5f2a097a359", "parents": [ "4dd4e16066d51555fef0ef8866258f8ee1cf1a7b" ], "author": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Mon Jan 20 19:58:23 2025 +0100" }, "committer": { "name": "Christoffer Adamsen", "email": "christofferqa@google.com", "time": "Tue Feb 04 05:15:37 2025 -0800" }, "message": "Explicitly set proguard_compatibility for updatable-media\n\nThis currently defaults to proguard_compatibility, which is made explicit by this change.\n\nThis ensures that this target will not be affected by changing the default value of proguard_compatibility to false.\n\nBug: 215530220\nTest: existing\nChange-Id: I40450d6fec6bee73eb21e89d965aa2703922f7fd\n" }, { "commit": "4dd4e16066d51555fef0ef8866258f8ee1cf1a7b", "tree": "ba6708ae90c6d5a0a38e9b9bc6b2264fd2179792", "parents": [ "f3536dcc9c1ad74c20e4e9e735c16dd5c21e4772", "d1f8c5eaa9549e8c52fe4c9dd20087cf76f3b353" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Dec 10 13:30:31 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 10 13:30:31 2024 +0000" }, "message": "Merge \"Update MediaSession2 note to point to Media3\" into main am: d1f8c5eaa9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3391141\n\nChange-Id: I199262b9fe5e27abf5a72ca315b84b3692111fb8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1f8c5eaa9549e8c52fe4c9dd20087cf76f3b353", "tree": "ba6708ae90c6d5a0a38e9b9bc6b2264fd2179792", "parents": [ "f3536dcc9c1ad74c20e4e9e735c16dd5c21e4772", "ce22d89bab974f4ceeb498b1ce961622c4d13c01" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Dec 10 12:59:35 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Dec 10 12:59:35 2024 +0000" }, "message": "Merge \"Update MediaSession2 note to point to Media3\" into main" }, { "commit": "287aa4e574527194425000c2593f342ccaa6cf59", "tree": "da29ed31904d66a9d667ef287d6ecd272ec6e7aa", "parents": [ "6bbd9fa8ddb27665ab00293fb3686c602d585f01" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Dec 06 14:17:09 2024 -0600" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Dec 06 14:20:39 2024 -0600" }, "message": "Flag library based on class name for the flags\n\nFollows pattern used in other libraries for accessing flag status.\n\nBug: 189976186\nTest: build \u0026 boot\nFlag: com.android.media.metrics.flags.mediametrics_to_module\nChange-Id: I2c43b6b15162295c8f74bc1a2f2142869803a16e\n" }, { "commit": "ce22d89bab974f4ceeb498b1ce961622c4d13c01", "tree": "ba6708ae90c6d5a0a38e9b9bc6b2264fd2179792", "parents": [ "50344f75a96cab4beb53ab0df4d5f3e3c218f681" ], "author": { "name": "Toni Heidenreich", "email": "tonihei@google.com", "time": "Fri Dec 06 09:48:09 2024 +0000" }, "committer": { "name": "Toni Heidenreich", "email": "tonihei@google.com", "time": "Fri Dec 06 09:48:09 2024 +0000" }, "message": "Update MediaSession2 note to point to Media3\n\nChange-Id: I12a4eb0ae58471fc71fa0fe36878fdc98cdc3c6f\nTest: javadoc only\n" }, { "commit": "6bbd9fa8ddb27665ab00293fb3686c602d585f01", "tree": "52737ddb0653cb166df8b24d60e119d1602c38f5", "parents": [ "3c446491bd3839f7f097778965509923226ae5f4", "f3536dcc9c1ad74c20e4e9e735c16dd5c21e4772" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Nov 13 03:02:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 03:02:06 2024 +0000" }, "message": "Fix namespace of \"mediametrics_to_module\" flag am: 50344f75a9 am: f3536dcc9c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3345996\n\nChange-Id: I5064df5a712b9eb46a6f08e104733a84184cb490\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3536dcc9c1ad74c20e4e9e735c16dd5c21e4772", "tree": "52737ddb0653cb166df8b24d60e119d1602c38f5", "parents": [ "d1d4279cc1a787e8837286cf87cba0a5684526ff", "50344f75a96cab4beb53ab0df4d5f3e3c218f681" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Nov 13 02:40:06 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 02:40:06 2024 +0000" }, "message": "Fix namespace of \"mediametrics_to_module\" flag am: 50344f75a9\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3345996\n\nChange-Id: I2dc949a07076fd1237a1236da490db99ba5ec392\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3c446491bd3839f7f097778965509923226ae5f4", "tree": "ff5dbea4a96e837d40423b8ea1d4c06d3c77c1a1", "parents": [ "f12373d385529211f70c113d9e324093cd91a433", "d1d4279cc1a787e8837286cf87cba0a5684526ff" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Nov 13 01:21:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 01:21:36 2024 +0000" }, "message": "Create \"mediametrics_to_module\" flag am: a889a61487 am: d1d4279cc1\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3341086\n\nChange-Id: Idc11dbced3744ed68d5ba5b9b9399937cc134898\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50344f75a96cab4beb53ab0df4d5f3e3c218f681", "tree": "52737ddb0653cb166df8b24d60e119d1602c38f5", "parents": [ "a889a61487816ea50bc16919ff5727e2551b7449" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Nov 12 18:48:53 2024 -0600" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Nov 12 18:48:53 2024 -0600" }, "message": "Fix namespace of \"mediametrics_to_module\" flag\n\n\"media\" -\u003e \"media_reliability\"\n\nFlag: com.android.media.metrics.flags.mediametrics_to_module\nBug: 189976186\nTest: build\nChange-Id: I1d9cc5ea0140f2bf6e15acf0dcd0aa03f50f2bc5\n" }, { "commit": "d1d4279cc1a787e8837286cf87cba0a5684526ff", "tree": "ff5dbea4a96e837d40423b8ea1d4c06d3c77c1a1", "parents": [ "f12373d385529211f70c113d9e324093cd91a433", "a889a61487816ea50bc16919ff5727e2551b7449" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Nov 13 00:47:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Nov 13 00:47:59 2024 +0000" }, "message": "Create \"mediametrics_to_module\" flag am: a889a61487\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3341086\n\nChange-Id: Id2032b52823c6e84f01831292f68e07191f4f4d8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a889a61487816ea50bc16919ff5727e2551b7449", "tree": "ff5dbea4a96e837d40423b8ea1d4c06d3c77c1a1", "parents": [ "a9894a733a5ff3808fb602f5426860204f734039" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Nov 12 14:56:30 2024 -0600" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Tue Nov 12 14:56:30 2024 -0600" }, "message": "Create \"mediametrics_to_module\" flag\n\ncreate the flag and the library for reading the value.\nexport library so non-module code can read flags to know if a routine is\npresent.\n\nFlag: com.android.media.metrics.flags.mediametrics_to_module\nBug: 189976186\nTest: build\nChange-Id: Id801c7dd4df2254583588b12222ec260f7a72be7\n" }, { "commit": "f12373d385529211f70c113d9e324093cd91a433", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "58c6ab8f89330fa0fe9c4d398be32266d51c1ec1", "de162832e14d1882f6f12845de0b2305d548bd1b" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:46:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:46:50 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: a9894a733a -s ours am: de162832e1 -s ours\n\nam skip reason: Merged-In Id31f5d13a2b11a173887d417029375215eaf6abd with SHA-1 316ba7c659 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3258447\n\nChange-Id: I6d372f2c232a4fe085c636d330d5ee928aa2cd39\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "de162832e14d1882f6f12845de0b2305d548bd1b", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "9a790c46e40c0fd6452ff24dd4d20b59659ecfdb", "a9894a733a5ff3808fb602f5426860204f734039" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Sep 07 02:06:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Sep 07 02:06:39 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 to AOSP main am: a9894a733a -s ours\n\nam skip reason: Merged-In Id31f5d13a2b11a173887d417029375215eaf6abd with SHA-1 316ba7c659 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3258447\n\nChange-Id: Iba125f46ccde5684c3ed70135e82fbef73d8e7ce\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a9894a733a5ff3808fb602f5426860204f734039", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "a2d4eeb286407c77a5b10a8aba2267b7f0194186", "9a790c46e40c0fd6452ff24dd4d20b59659ecfdb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:00 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Sep 05 17:03:00 2024 -0700" }, "message": "Merge 24Q3 to AOSP main\n\nBug: 357762254\nMerged-In: Id31f5d13a2b11a173887d417029375215eaf6abd\nChange-Id: I7706318ccfe2d31afcc02afab3f2d5416acfbba2\n" }, { "commit": "58c6ab8f89330fa0fe9c4d398be32266d51c1ec1", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "8b138eef95dc47b9c10b5ea424eae03e946f3532", "9a790c46e40c0fd6452ff24dd4d20b59659ecfdb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 20 20:55:45 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jun 20 20:55:45 2024 +0000" }, "message": "[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 9a790c46e4 -s ours\n\nam skip reason: Merged-In Id31f5d13a2b11a173887d417029375215eaf6abd with SHA-1 316ba7c659 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/27908433\n\nChange-Id: Id9dab875692c63a32bb23cf50f3da086767ed85e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a790c46e40c0fd6452ff24dd4d20b59659ecfdb", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "ccd0e6a06d0b37663751c05620e2a6655bb3c923", "aa8a60001b9471f71852c5cdee7215372e735831" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:46 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 14:13:46 2024 -0700" }, "message": "Merge 24Q3 (ab/11976889) to aosp-main-future\n\nBug: 347831320\nMerged-In: Id31f5d13a2b11a173887d417029375215eaf6abd\nChange-Id: I71ef5c6eccaf21251bde3ba2ea83bcc3c2458834\n" }, { "commit": "8b138eef95dc47b9c10b5ea424eae03e946f3532", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "aa8a60001b9471f71852c5cdee7215372e735831", "ccd0e6a06d0b37663751c05620e2a6655bb3c923" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jun 18 05:55:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 18 05:55:18 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: a2d4eeb286 -s ours am: ccd0e6a06d -s ours\n\nam skip reason: Merged-In I3c90b9e3c51fa43a7eb6883278d0f5367c7ac96a with SHA-1 6329ab6bc0 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3131622\n\nChange-Id: I66a498a0abfd63a4c659aeee5d5f3b782913c113\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ccd0e6a06d0b37663751c05620e2a6655bb3c923", "tree": "638bd59366cefbcb4f8f7aaf4f2ccb71240e791e", "parents": [ "6329ab6bc0cce66d7c280e19c52a37bcbb679249", "a2d4eeb286407c77a5b10a8aba2267b7f0194186" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jun 17 20:41:11 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jun 17 20:41:11 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR3 to AOSP main am: a2d4eeb286 -s ours\n\nam skip reason: Merged-In I3c90b9e3c51fa43a7eb6883278d0f5367c7ac96a with SHA-1 6329ab6bc0 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/3131622\n\nChange-Id: I0371ccdffc17d0355de4a8c1176182f35c9a4d80\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a2d4eeb286407c77a5b10a8aba2267b7f0194186", "tree": "638bd59366cefbcb4f8f7aaf4f2ccb71240e791e", "parents": [ "6c78ffd994ce6c02474eb2b6f943eb69b79891e0", "6329ab6bc0cce66d7c280e19c52a37bcbb679249" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:36 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Jun 13 10:50:36 2024 -0700" }, "message": "Merge Android 14 QPR3 to AOSP main\n\nBug: 346855327\nMerged-In: I3c90b9e3c51fa43a7eb6883278d0f5367c7ac96a\nChange-Id: I561cc451f659c8b7f89c4c4fbc9c710490a8c73c\n" }, { "commit": "aa8a60001b9471f71852c5cdee7215372e735831", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "316ba7c659a612f0aea9c69aa3cb907b456ad966", "6329ab6bc0cce66d7c280e19c52a37bcbb679249" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed May 29 20:48:19 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed May 29 20:48:19 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: 6329ab6bc0 -s ours\n\nam skip reason: Merged-In If13e37eef6caf749b593ccd96dc6728dced9e272 with SHA-1 3c605cdfa1 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/27273334\n\nChange-Id: I48c94450801d0398cf1ac6f8dca6a5b03df55938\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6329ab6bc0cce66d7c280e19c52a37bcbb679249", "tree": "638bd59366cefbcb4f8f7aaf4f2ccb71240e791e", "parents": [ "8b57af467fc19755bd07f0c7a749be378f7c1617", "3c605cdfa1e3d23c7d0e66cea70624cf9002eee9" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 12:09:34 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon May 06 23:42:09 2024 -0700" }, "message": "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: If13e37eef6caf749b593ccd96dc6728dced9e272\nChange-Id: I3c90b9e3c51fa43a7eb6883278d0f5367c7ac96a\n" }, { "commit": "316ba7c659a612f0aea9c69aa3cb907b456ad966", "tree": "1c9fa07619f8c333703d43e4cfee0b8a4effa608", "parents": [ "405ba7b3b61e333bbdbc0b953a42fd2dfdaebfe9" ], "author": { "name": "Bishoy Gendy", "email": "bishoygendy@google.com", "time": "Fri Apr 05 09:46:03 2024 +0000" }, "committer": { "name": "Bishoy Gendy", "email": "bishoygendy@google.com", "time": "Fri Apr 05 11:58:24 2024 +0000" }, "message": "Update javadoc for SessionCallback.onSession2TokenCreated(token)\n\nBug: 324266224\nTest: mp droid\nChange-Id: Id31f5d13a2b11a173887d417029375215eaf6abd\n" }, { "commit": "405ba7b3b61e333bbdbc0b953a42fd2dfdaebfe9", "tree": "d3d0d50473d0597ace9b55d9fd18fdd6e5c646b2", "parents": [ "011d4af72495eb3aaa635a1f7a1380fcfe205a18" ], "author": { "name": "Yu Liu", "email": "yudiliu@google.com", "time": "Wed Mar 27 18:01:53 2024 +0000" }, "committer": { "name": "Yu Liu", "email": "yudiliu@google.com", "time": "Wed Mar 27 18:01:53 2024 +0000" }, "message": "Add missing aconfig container field to package/modules/Media/flags\n\nBug: 330354107\nTest: CI\n\nFlag: NONE\n\nIgnore-AOSP-First: It is easier to detect all the mismatch in internal\nmaster.\n\nChange-Id: I92227c53560f5e706ae8cd08825167fdffd550c0\n" }, { "commit": "011d4af72495eb3aaa635a1f7a1380fcfe205a18", "tree": "3491f04cec5adb8d71591248df0bab6c7b0055f2", "parents": [ "b07f7dbbc64ca145c892ea43be629994efd38732" ], "author": { "name": "Oriol Prieto Gasco", "email": "opg@google.com", "time": "Fri Mar 01 16:52:45 2024 +0000" }, "committer": { "name": "Oriol Prieto Gasco", "email": "opg@google.com", "time": "Tue Mar 12 14:20:39 2024 +0000" }, "message": "Export flags used in FlaggedApi annotations\n\nBefore calling a flagged API, client code must check the value of the flag\nwhich gates it. Those flags must be exported in order to be accessible from\ncontainers other than the container where the flag and the API are hosted.\n\nBug: 320984775\nBug: 322839671\n\nTest: m all_aconfig_declarations\nTest: printflags --format\u003d\u0027{fully_qualified_name}:{is_exported}\u0027 | grep true\n\nChange-Id: I6d4b1b777d05cbb64f87409ca1eb974baa5bd709\n" }, { "commit": "b07f7dbbc64ca145c892ea43be629994efd38732", "tree": "159d6718b1cec2ba745839d433096f8e2fa28a72", "parents": [ "3c605cdfa1e3d23c7d0e66cea70624cf9002eee9", "8b57af467fc19755bd07f0c7a749be378f7c1617" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 10:46:18 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 10:46:18 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 6c78ffd994 -s ours am: 8b57af467f -s ours\n\nam skip reason: Merged-In Icc105c242b594c0522ebcd5865c231c3169d35f5 with SHA-1 ff181b22fd is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2990826\n\nChange-Id: I37ee5beda396f9b5639ad8b1e917b3e2337e8f27\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8b57af467fc19755bd07f0c7a749be378f7c1617", "tree": "032cc86b4d7944fa5588d715a47d43880cf823e0", "parents": [ "ff181b22fdd275a48034c6bfbe463db7f3de395c", "6c78ffd994ce6c02474eb2b6f943eb69b79891e0" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 07 09:54:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Mar 07 09:54:53 2024 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 6c78ffd994 -s ours\n\nam skip reason: Merged-In Icc105c242b594c0522ebcd5865c231c3169d35f5 with SHA-1 ff181b22fd is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2990826\n\nChange-Id: I10bece74b24148837778b7c03f5feee4091e77d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c78ffd994ce6c02474eb2b6f943eb69b79891e0", "tree": "032cc86b4d7944fa5588d715a47d43880cf823e0", "parents": [ "14c33246f6fd227902ec858874333b133592c595", "ff181b22fdd275a48034c6bfbe463db7f3de395c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:09 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Mar 06 09:30:09 2024 -0800" }, "message": "Merge Android 14 QPR2 to AOSP main\n\nBug: 319669529\nMerged-In: Icc105c242b594c0522ebcd5865c231c3169d35f5\nChange-Id: I19c1e19988e372a4613f6d233993a4a8259cc244\n" }, { "commit": "3c605cdfa1e3d23c7d0e66cea70624cf9002eee9", "tree": "159d6718b1cec2ba745839d433096f8e2fa28a72", "parents": [ "2724eb6c6e420065d3f3a066fcb4ca3b68158b49" ], "author": { "name": "Bishoy Gendy", "email": "bishoygendy@google.com", "time": "Thu Feb 08 23:10:43 2024 +0000" }, "committer": { "name": "Bishoy Gendy", "email": "bishoygendy@google.com", "time": "Tue Feb 13 13:35:53 2024 +0000" }, "message": "Add pid to MediaSession2Record creation flow\n\n- Using Fixed Read Only Flags because of https://yaqs.corp.google.com/eng/q/6184679238960939008#a1\n\nBug: 318745416\nTest: atest cts/tests/app/src/android/app/cts/ActivityManagerFgsDelegateTest.java\nChange-Id: If13e37eef6caf749b593ccd96dc6728dced9e272\n" }, { "commit": "2724eb6c6e420065d3f3a066fcb4ca3b68158b49", "tree": "3d132482993586165ca65a255ff0e8be4f605681", "parents": [ "d053fd27d95e3599236458454c15985f7f1a11c1", "ff181b22fdd275a48034c6bfbe463db7f3de395c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jan 31 02:02:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 31 02:02:32 2024 +0000" }, "message": "[automerger skipped] Merge Android 24Q1 Release (ab/11220357) am: ff181b22fd -s ours\n\nam skip reason: Merged-In I43f68b92fd292c3df688085b0880ad5f04a77bf7 with SHA-1 7e0c115926 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/25973924\n\nChange-Id: Icb7499f2f3fe3737ccd14044a71adf6208586df1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ff181b22fdd275a48034c6bfbe463db7f3de395c", "tree": "032cc86b4d7944fa5588d715a47d43880cf823e0", "parents": [ "5ff773ef8dba035e43c2168bf6d8adf639d952f1", "f32abc8235b020e8ec17fdc478ae4e45351cf7bf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jan 29 10:22:40 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Jan 29 10:22:40 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I43f68b92fd292c3df688085b0880ad5f04a77bf7\nChange-Id: Icc105c242b594c0522ebcd5865c231c3169d35f5\n" }, { "commit": "d053fd27d95e3599236458454c15985f7f1a11c1", "tree": "3d132482993586165ca65a255ff0e8be4f605681", "parents": [ "a8bf81dad2a8003ee99514cb8032f2d3ab588be3", "5ff773ef8dba035e43c2168bf6d8adf639d952f1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 19:33:42 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 25 19:33:42 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files am: 14c33246f6 am: 5ff773ef8d\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2926741\n\nChange-Id: Ib0a0db0693fd6f3a939ddf1a1630d559e71f8ede\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ff773ef8dba035e43c2168bf6d8adf639d952f1", "tree": "9d2cfab8020e9e6aeeffa8f322e495ba56687aac", "parents": [ "7f3feaeab815399c4471d540e8eb13c52b2a6906", "14c33246f6fd227902ec858874333b133592c595" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 18:50:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 25 18:50:04 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files am: 14c33246f6\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2926741\n\nChange-Id: I22ebfc8b0f138e96c0ddb763409546a3bcdf9732\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "14c33246f6fd227902ec858874333b133592c595", "tree": "9d2cfab8020e9e6aeeffa8f322e495ba56687aac", "parents": [ "8641d6bca4a569d3d0223f6e61a6ed6c19a82a66" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 01:05:27 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 25 01:05:27 2024 +0000" }, "message": "Remove java_api_contribution modules from .bp files\n\njava_api_contribution modules are dynamically generated from droidstubs\nmodules or java_sdk_library_import, and is not a user-facing module.\nDefining this module is a .bp file is a no-op.\n\nTest: m nothing\nBug: 322242515\nChange-Id: I2f22e1b93039d0b101389e41d3290a336b99dfb8\n" }, { "commit": "a8bf81dad2a8003ee99514cb8032f2d3ab588be3", "tree": "fb0e1c711aaa8483ca7d18ee3e53bf068b83e88f", "parents": [ "4b447c245c76cb61201bb4eba54408c8d37395f4" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Jan 10 12:30:42 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Jan 10 12:30:42 2024 -0800" }, "message": "Baseline NewApi issues\n\nNewApi is a lint check that you don\u0027t call framework methods that were\nintroduced in versions later than your min_sdk_version. We want to\nmake this an error, so we\u0027re baselineing all existing issues.\n\nThis cl was generated automatically, by taking all the NewApi issues\nfrom the reference baselines, and all the non-NewApi issues from the\nexisting checked in baselines.\n\nBug: 268261262\nTest: Presubmits\nChange-Id: Iea2f0c1bf20d7dfcd77c27e4158cfc839d11deba\n" }, { "commit": "4b447c245c76cb61201bb4eba54408c8d37395f4", "tree": "9e27305f4b38e2be3f514328be88b94d95ca1274", "parents": [ "f32abc8235b020e8ec17fdc478ae4e45351cf7bf", "c609ed83e5c9cbb71c8b4f0106ddbcb7592a037c" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 23:05:46 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 23:05:46 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: 8641d6bca4 am: 7f3feaeab8 am: c609ed83e5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2886429\n\nChange-Id: Ie60b50ed8913046ccdf5b3e79d92cc6f740dff4f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c609ed83e5c9cbb71c8b4f0106ddbcb7592a037c", "tree": "64e27c9eb38e8f1a2f25959697ea67aa60958b88", "parents": [ "efc8cee8e0dcd03de1f699ea66afdd66af91e161", "7f3feaeab815399c4471d540e8eb13c52b2a6906" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 22:32:23 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 22:32:23 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: 8641d6bca4 am: 7f3feaeab8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2886429\n\nChange-Id: I179c81cda367e92731eb0d83ae145058ecf559f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7f3feaeab815399c4471d540e8eb13c52b2a6906", "tree": "64e27c9eb38e8f1a2f25959697ea67aa60958b88", "parents": [ "ccd9a85b88c71dd0ce76013d9be98be3adc76294", "8641d6bca4a569d3d0223f6e61a6ed6c19a82a66" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Thu Dec 21 22:02:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 21 22:02:10 2023 +0000" }, "message": "List baseline_filename on modules that are implititly using it am: 8641d6bca4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2886429\n\nChange-Id: I09179c63185655119753a1c47c2a8526d46af219\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8641d6bca4a569d3d0223f6e61a6ed6c19a82a66", "tree": "64e27c9eb38e8f1a2f25959697ea67aa60958b88", "parents": [ "f1b4f84236df4c9a5fab15f642f8180c7f8fcab2" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:08 2023 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Wed Dec 20 11:57:08 2023 -0800" }, "message": "List baseline_filename on modules that are implititly using it\n\nlintable modules currently pick up files named \"lint-baseline.xml\" to use as the\nlint baseline implicitly. This is confusing because you could end up using the\nbaseline files in more modules than intended. Lint also has a feature where it\nrequests you remove unnecessary findings from the baseline file, so something\ncould be necessary for one module, but unnecessary for another that accidentally\npicked up the baseline.\n\nWe\u0027re removing the implicit detection of the baseline file, which requires\nall modules using it to list the baseline file explicitly.\n\nBug: 272769514\nTest: Presubmits\nChange-Id: Ic2a8b91bde5fc5610d8814f1dfcd0f41e3567948\n" }, { "commit": "f32abc8235b020e8ec17fdc478ae4e45351cf7bf", "tree": "81b9847ccb5fc64961bee20de354f48d557b2054", "parents": [ "15b0eb7df05772518fcc98f0a95410548f7481bc", "efc8cee8e0dcd03de1f699ea66afdd66af91e161" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Dec 14 02:09:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 14 02:09:04 2023 +0000" }, "message": "Remove sungsoo@google.com from apex/OWNERS am: f1b4f84236 am: ccd9a85b88 am: efc8cee8e0\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2867394\n\nChange-Id: Ic4b2f9c5679fe99a3c6268b63486ac18ee888721\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "efc8cee8e0dcd03de1f699ea66afdd66af91e161", "tree": "990247e0e09a50731830cc645c4e2d4116822c71", "parents": [ "15ae2dcd24d0f8f2959b5aef12fbe51ff61b2044", "ccd9a85b88c71dd0ce76013d9be98be3adc76294" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Dec 14 01:36:03 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 14 01:36:03 2023 +0000" }, "message": "Remove sungsoo@google.com from apex/OWNERS am: f1b4f84236 am: ccd9a85b88\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2867394\n\nChange-Id: I7220d9cc74b1dcc008897ee185499f742ded9d46\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ccd9a85b88c71dd0ce76013d9be98be3adc76294", "tree": "990247e0e09a50731830cc645c4e2d4116822c71", "parents": [ "6c6a218cd7dad70ba68307349eddfcaa25e69aba", "f1b4f84236df4c9a5fab15f642f8180c7f8fcab2" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Thu Dec 14 01:06:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 14 01:06:27 2023 +0000" }, "message": "Remove sungsoo@google.com from apex/OWNERS am: f1b4f84236\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2867394\n\nChange-Id: I9e2eef2df244730102968f84f5e7c82b262ed74f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "15b0eb7df05772518fcc98f0a95410548f7481bc", "tree": "a877ba29fbd59ac3e2878289e2c9fe87fb3d1a01", "parents": [ "7e0c115926cf71ff513f83bf6f0de2dc1618d3f4", "15ae2dcd24d0f8f2959b5aef12fbe51ff61b2044" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:57:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:57:26 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8d150b3985 -s ours am: 6c6a218cd7 -s ours am: 15ae2dcd24 -s ours\n\nam skip reason: Merged-In I457840158072f5d020d00875f3de1b32c9ab5665 with SHA-1 e6bd4911b7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2866436\n\nChange-Id: I969e5c97da3b1c1c3382abe3347440f1ce63d2c7\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "15ae2dcd24d0f8f2959b5aef12fbe51ff61b2044", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "37f1c74c1d2ac78e6920629474294f54a86e1434", "6c6a218cd7dad70ba68307349eddfcaa25e69aba" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 22:02:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 22:02:14 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8d150b3985 -s ours am: 6c6a218cd7 -s ours\n\nam skip reason: Merged-In I457840158072f5d020d00875f3de1b32c9ab5665 with SHA-1 e6bd4911b7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2866436\n\nChange-Id: Ia0d7e12858b3921f108fbb43fc946b2809368eb8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6c6a218cd7dad70ba68307349eddfcaa25e69aba", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "e6bd4911b7b7ca126820746d27ade4df21ffeef1", "8d150b39858077551f642aa03cf2ac0b127fb141" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Dec 11 21:16:25 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 11 21:16:25 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 QPR1 am: 8d150b3985 -s ours\n\nam skip reason: Merged-In I457840158072f5d020d00875f3de1b32c9ab5665 with SHA-1 e6bd4911b7 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2866436\n\nChange-Id: I64d3048d6f3d4a4422a819e06156b533f029a6d2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f1b4f84236df4c9a5fab15f642f8180c7f8fcab2", "tree": "990247e0e09a50731830cc645c4e2d4116822c71", "parents": [ "8d150b39858077551f642aa03cf2ac0b127fb141" ], "author": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sat Dec 09 17:20:24 2023 +0000" }, "committer": { "name": "Owner Cleanup Bot", "email": "swarming-tasks@owners-cleanup-prod.google.com.iam.gserviceaccount.com", "time": "Sat Dec 09 17:20:27 2023 +0000" }, "message": "Remove sungsoo@google.com from apex/OWNERS\n\nThis suggested change is automatically generated based on group\nmemberships and affiliations.\nIf this change is unnecessary or in error, vote CR -1 and the bot\nwill abandon it. Vote CR +1/2 to approve this change.\n\nSee the owner\u0027s recent activity for context:\nhttps://android-review.googlesource.com/q/sungsoo@google.com\n\nTo report an issue, file a bug in the Infra\u003eCodereview component.\n\nChange-Id: Ic280301e7b04d982140b98973b22024b00f065de\n" }, { "commit": "8d150b39858077551f642aa03cf2ac0b127fb141", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "70a944bf78ab2c60df0874b2a8eaffce23328c68", "e6bd4911b7b7ca126820746d27ade4df21ffeef1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:26 2023 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 08 13:14:26 2023 -0800" }, "message": "Merge Android 14 QPR1\n\nMerged-In: I457840158072f5d020d00875f3de1b32c9ab5665\nBug: 315507370\nChange-Id: I67cd18a04baf64f70d50243a7a17c63bd2822177\n" }, { "commit": "7e0c115926cf71ff513f83bf6f0de2dc1618d3f4", "tree": "a877ba29fbd59ac3e2878289e2c9fe87fb3d1a01", "parents": [ "5448e0c73abe56fa5a1c42f45fdda1cd0832ae01" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 25 15:39:48 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 10:16:05 2023 +0000" }, "message": "Baseline issues that were previously suppressed\n\njava_sdk_library has previously internally disabled a few legitimate\nissues. As this is being un-done for modules, add baselines for the\npre-existing issues.\n\nBug: 306806877\nTest: m checkapi\nChange-Id: I43f68b92fd292c3df688085b0880ad5f04a77bf7\n" }, { "commit": "5448e0c73abe56fa5a1c42f45fdda1cd0832ae01", "tree": "6888b690e3534178a33f3fb9ca5740609a8395a9", "parents": [ "72ad23e404bf6dfefab048f1604301cebca7dd41", "37f1c74c1d2ac78e6920629474294f54a86e1434" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 23:54:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 23:54:26 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: e6bd4911b7 -s ours am: 37f1c74c1d -s ours\n\nam skip reason: Merged-In Ic215d209db3c0afa7b80610fed91ca5b10bfdc99 with SHA-1 c9555bc861 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/25089416\n\nChange-Id: I93ddd1b22b35b1d57733ae567f17119ecc82d0a9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "37f1c74c1d2ac78e6920629474294f54a86e1434", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "c9555bc861b16b4abe43a885aa29fb0eb774fa6f", "e6bd4911b7b7ca126820746d27ade4df21ffeef1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 19 18:47:40 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 19 18:47:40 2023 +0000" }, "message": "[automerger skipped] Merge 10952656 am: e6bd4911b7 -s ours\n\nam skip reason: Merged-In Ic215d209db3c0afa7b80610fed91ca5b10bfdc99 with SHA-1 c9555bc861 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/25089416\n\nChange-Id: Ie1ebafd3fc9e62ab098c386e035a6d6d96919dee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e6bd4911b7b7ca126820746d27ade4df21ffeef1", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "3f7803b544c28cac3ff1feb01e4c8765b1c5ae74", "c9555bc861b16b4abe43a885aa29fb0eb774fa6f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:56 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Oct 17 10:08:56 2023 -0700" }, "message": "Merge 10952656\n\nMerged-In: Ic215d209db3c0afa7b80610fed91ca5b10bfdc99\nChange-Id: I457840158072f5d020d00875f3de1b32c9ab5665\n" }, { "commit": "72ad23e404bf6dfefab048f1604301cebca7dd41", "tree": "6888b690e3534178a33f3fb9ca5740609a8395a9", "parents": [ "5d98071433c6e46ced945775dd4f5bf0dd423ef0", "c9555bc861b16b4abe43a885aa29fb0eb774fa6f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Oct 07 00:19:37 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:19:37 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 70a944bf78 -s ours am: 3f7803b544 -s ours am: e0f976e17f -s ours am: 9205ecda90 -s ours am: c9555bc861 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2777111\n\nChange-Id: I63b70134f360b2ae76764246f1f33122761283b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c9555bc861b16b4abe43a885aa29fb0eb774fa6f", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "e9aac9d25c95100fd270d23dd842f6dd1b2a942f", "9205ecda909fa51a9b267a66fc8cf1372727697e" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 11:00:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 11:00:07 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 70a944bf78 -s ours am: 3f7803b544 -s ours am: e0f976e17f -s ours am: 9205ecda90 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2777111\n\nChange-Id: Ic215d209db3c0afa7b80610fed91ca5b10bfdc99\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9205ecda909fa51a9b267a66fc8cf1372727697e", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "d2dfd7ca17832857805bcb353694d22c2c521d2f", "e0f976e17f56ea66c0122e1d7fb556520b4e0280" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 09:50:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 09:50:16 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 70a944bf78 -s ours am: 3f7803b544 -s ours am: e0f976e17f -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2777111\n\nChange-Id: I96ca5e43867522af3f747df9cc35d20baf4863bb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e0f976e17f56ea66c0122e1d7fb556520b4e0280", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "aed6935be2c37a86d8ff993e39318f015467ed13", "3f7803b544c28cac3ff1feb01e4c8765b1c5ae74" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 08:58:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 08:58:35 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 70a944bf78 -s ours am: 3f7803b544 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2777111\n\nChange-Id: I96e925a3f77b10f83d6dfb56a6b9adfe09eabbe0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f7803b544c28cac3ff1feb01e4c8765b1c5ae74", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "5a1dae40745959fed46fee4b461b7b19dbc3dfb2", "70a944bf78ab2c60df0874b2a8eaffce23328c68" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 06 07:51:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 06 07:51:35 2023 +0000" }, "message": "[automerger skipped] Merge Android 14 am: 70a944bf78 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2777111\n\nChange-Id: I13443d2f02ab8bc4faa2498ef091b6151e0ded06\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "70a944bf78ab2c60df0874b2a8eaffce23328c68", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "39cbba4d3e46e7e51d54448d65e3deb4b2689f58", "5a1dae40745959fed46fee4b461b7b19dbc3dfb2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:18 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 05 15:42:18 2023 -0700" }, "message": "Merge Android 14\n\nBug: 298295554\nMerged-In: Ib8dce559d57564f6383c43bd1c9e2efedda7d92c\nChange-Id: Ia90a9997a3b59e7ceb7e28df071819ebbfed40b0\n" }, { "commit": "5d98071433c6e46ced945775dd4f5bf0dd423ef0", "tree": "6888b690e3534178a33f3fb9ca5740609a8395a9", "parents": [ "015bac37d559fa044e6566a9b0b01ba1219e56e1", "e9aac9d25c95100fd270d23dd842f6dd1b2a942f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 20:37:34 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 20:37:34 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 5a1dae4074 -s ours am: aed6935be2 -s ours am: d2dfd7ca17 -s ours am: e9aac9d25c -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24181980\n\nChange-Id: I6f749e6f260ca1eb8b478677a54e5dc4dff5871b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e9aac9d25c95100fd270d23dd842f6dd1b2a942f", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "7fc6be45a4706ada39bf5a370b4276e15a1735b4", "d2dfd7ca17832857805bcb353694d22c2c521d2f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 01:10:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 01:10:27 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 5a1dae4074 -s ours am: aed6935be2 -s ours am: d2dfd7ca17 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24181980\n\nChange-Id: I512a32fa1f53260a02dde3d905249e36dd0847ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d2dfd7ca17832857805bcb353694d22c2c521d2f", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "a07d46c9c2e55336ffc9aff0a255e16f3fc9c3e8", "aed6935be2c37a86d8ff993e39318f015467ed13" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Aug 29 00:34:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 29 00:34:44 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 5a1dae4074 -s ours am: aed6935be2 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24181980\n\nChange-Id: I17470c0b1de1adf3066df529d2d92a835d2e8880\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "aed6935be2c37a86d8ff993e39318f015467ed13", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "fe4c2970542d2499524a7471d35658218e348cea", "5a1dae40745959fed46fee4b461b7b19dbc3dfb2" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 28 23:58:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 28 23:58:44 2023 +0000" }, "message": "[automerger skipped] Merge Android U (ab/10368041) am: 5a1dae4074 -s ours\n\nam skip reason: Merged-In Ib8dce559d57564f6383c43bd1c9e2efedda7d92c with SHA-1 fe4c297054 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24181980\n\nChange-Id: I513514e2b16a17df407b1f788d524a57e60368af\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5a1dae40745959fed46fee4b461b7b19dbc3dfb2", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "39cbba4d3e46e7e51d54448d65e3deb4b2689f58", "fe4c2970542d2499524a7471d35658218e348cea" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:42:50 2023 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Aug 14 15:42:50 2023 -0700" }, "message": "Merge Android U (ab/10368041)\n\nBug: 291102124\nMerged-In: Ib8dce559d57564f6383c43bd1c9e2efedda7d92c\nChange-Id: I9540ba07b384a5d8cc7232accb47578612f855ee\n" }, { "commit": "015bac37d559fa044e6566a9b0b01ba1219e56e1", "tree": "6888b690e3534178a33f3fb9ca5740609a8395a9", "parents": [ "21e0f52de92d509f917c6d16f5e3e005224334a8", "f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Mon Jul 31 15:14:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jul 31 15:14:17 2023 +0000" }, "message": "[automerger skipped] Fix NPE caused by a race condition am: f2dc4205bd -s ours\n\nam skip reason: Merged-In I5ce544087cd9d61d684ce4aaddc3222708676ca1 with SHA-1 8bffd51141 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24264743\n\nChange-Id: Ida90283cb9143bf49d5af944152d0731cda6b16b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f2dc4205bd753f6ac58c7798ad8a9df9f0e7da4f", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "9a8c9d0ff34e53839ac23c093bef63f05df5cf4a" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Fri Jul 28 09:44:05 2023 +0000" }, "committer": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Mon Jul 31 12:49:02 2023 +0000" }, "message": "Fix NPE caused by a race condition\n\nPlease take a look at the linked bug for the stacktrace. You will\nnotice that the failure is a null pointer exception in a non-null\nfinal field (MediaCommunicationService$Session2Record.mController).\nThis occurs because the MediaController2 constructor (invoked in\nthe Session2Record constructor) does non trivial work, including\nthe potential dispatching of an onDisconnected callback. In the\ncase of Session2Record, said callback is implemented as a non-static\ninner class. Which means the Session2Record is effectively passing\na `this` reference of an object that has not yet been fully\nconstructed. In this specific case, mController has not yet been\nassigned. Because MediaController2.ControllerCallback#onDisconnected\nis documented to not need calling \"close\" after its invocation, this\nfix just avoids calling mController.close() when onDisconnected is\ncalled, as its not necessary.\n\nA longer term fix should aim to avoid the use of this of a not-fully\nconstructed object altogether, but due to the way the\nMediaController2 constructor works, it\u0027s not possible to do that\nwithout more invasive changes, which we should consider for main,\nguarding it using a flag.\n\nBug: 290809698\nTest: atest CtsMediaBetterTogetherTestCases\nChange-Id: I5ce544087cd9d61d684ce4aaddc3222708676ca1\n(cherry picked from commit 8bffd511417f088aa6480371cea8d0881ed7547d)\nMerged-In: I5ce544087cd9d61d684ce4aaddc3222708676ca1\n" }, { "commit": "21e0f52de92d509f917c6d16f5e3e005224334a8", "tree": "6888b690e3534178a33f3fb9ca5740609a8395a9", "parents": [ "2bed95effe766dd5ea0f4f92401cc2029f51e1df", "7fc6be45a4706ada39bf5a370b4276e15a1735b4" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Fri Jul 28 21:19:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 28 21:19:10 2023 +0000" }, "message": "Fix NPE caused by a race condition am: 8bffd51141 am: 7fc6be45a4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24242049\n\nChange-Id: I4af459d7a86f05a7d10af5ea72602d527fc302b3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7fc6be45a4706ada39bf5a370b4276e15a1735b4", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "a07d46c9c2e55336ffc9aff0a255e16f3fc9c3e8", "8bffd511417f088aa6480371cea8d0881ed7547d" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Fri Jul 28 20:38:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 28 20:38:36 2023 +0000" }, "message": "Fix NPE caused by a race condition am: 8bffd51141\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/24242049\n\nChange-Id: Iee94403e5057cb98e700e510ac27e4d7aafc67e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8bffd511417f088aa6480371cea8d0881ed7547d", "tree": "046b01885828a2f29163936644cf82a058d29472", "parents": [ "a07d46c9c2e55336ffc9aff0a255e16f3fc9c3e8" ], "author": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Fri Jul 28 09:44:05 2023 +0000" }, "committer": { "name": "Santiago Seifert", "email": "aquilescanta@google.com", "time": "Fri Jul 28 12:20:44 2023 +0000" }, "message": "Fix NPE caused by a race condition\n\nPlease take a look at the linked bug for the stacktrace. You will\nnotice that the failure is a null pointer exception in a non-null\nfinal field (MediaCommunicationService$Session2Record.mController).\nThis occurs because the MediaController2 constructor (invoked in\nthe Session2Record constructor) does non trivial work, including\nthe potential dispatching of an onDisconnected callback. In the\ncase of Session2Record, said callback is implemented as a non-static\ninner class. Which means the Session2Record is effectively passing\na `this` reference of an object that has not yet been fully\nconstructed. In this specific case, mController has not yet been\nassigned. Because MediaController2.ControllerCallback#onDisconnected\nis documented to not need calling \"close\" after its invocation, this\nfix just avoids calling mController.close() when onDisconnected is\ncalled, as its not necessary.\n\nA longer term fix should aim to avoid the use of this of a not-fully\nconstructed object altogether, but due to the way the\nMediaController2 constructor works, it\u0027s not possible to do that\nwithout more invasive changes, which we should consider for main,\nguarding it using a flag.\n\nBug: 290809698\nTest: atest CtsMediaBetterTogetherTestCases\nChange-Id: I5ce544087cd9d61d684ce4aaddc3222708676ca1\n" }, { "commit": "2bed95effe766dd5ea0f4f92401cc2029f51e1df", "tree": "51de3c5320693f4aa9960d7dee38fd29849cfc8e", "parents": [ "f402aefd1182d0a1f9ef378a7b75775644b0c804" ], "author": { "name": "Alexandre Francois", "email": "alexfrancois@google.com", "time": "Thu Jul 06 18:38:46 2023 +0000" }, "committer": { "name": "Alexandre Francois", "email": "alexfrancois@google.com", "time": "Thu Jul 13 14:41:38 2023 +0000" }, "message": "Enforce MEDIA_CONTENT_CONTROL permission in MediaCommunicationService.registerCallback\n\nThrow a SecurityException if the caller does not have permission (required per documentation)\n\nBug: 261442741\nTest: Manual with apk provided in the bug, atest MediaCommunicationManagerTest\nChange-Id: Ibc94246731422e9891eb6f8ee015a845e621ba63\n" }, { "commit": "f402aefd1182d0a1f9ef378a7b75775644b0c804", "tree": "c347d07cb504f64f7934daaffe9ceaf1fcbfb3e3", "parents": [ "5b4bb025de6934b9b4fe3ed61d96fd73c3d29cc4", "847e1ff3724732c0b92b192394a0eea8d6f1d35e" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 11 08:51:28 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 11 08:51:28 2023 +0000" }, "message": "Merge \"Fix transcode progress notification am: fe4c297054 am: a07d46c9c2\"" }, { "commit": "847e1ff3724732c0b92b192394a0eea8d6f1d35e", "tree": "c347d07cb504f64f7934daaffe9ceaf1fcbfb3e3", "parents": [ "ce0c285dba9f88fcfcd02b5aa754d5622328db01", "a07d46c9c2e55336ffc9aff0a255e16f3fc9c3e8" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Tue Apr 11 08:51:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 11 08:51:22 2023 +0000" }, "message": "Fix transcode progress notification am: fe4c297054 am: a07d46c9c2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/22533288\n\nChange-Id: I58e4a191b5948de9b5f36578665a9c6b4f73239e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5b4bb025de6934b9b4fe3ed61d96fd73c3d29cc4", "tree": "c347d07cb504f64f7934daaffe9ceaf1fcbfb3e3", "parents": [ "ce0c285dba9f88fcfcd02b5aa754d5622328db01", "9a8c9d0ff34e53839ac23c093bef63f05df5cf4a" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Tue Apr 11 08:51:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 11 08:51:16 2023 +0000" }, "message": "Fix transcode progress notification am: fe4c297054 am: 9a8c9d0ff3\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/22533288\n\nChange-Id: I509b13dedc3fab5af895db13c77314bd611e8089\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a8c9d0ff34e53839ac23c093bef63f05df5cf4a", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "d0757cafc8cb497a95588fff199fff8c6be3d0cc", "fe4c2970542d2499524a7471d35658218e348cea" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Tue Apr 11 08:22:48 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 11 08:22:48 2023 +0000" }, "message": "Fix transcode progress notification am: fe4c297054\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/22533288\n\nChange-Id: I7048b4993d591fe8ed474726d62aa0c59a3ad0d5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a07d46c9c2e55336ffc9aff0a255e16f3fc9c3e8", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "01c048fdce7f66f6cbf324f31497db2b0742814d", "fe4c2970542d2499524a7471d35658218e348cea" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Tue Apr 11 08:22:45 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Apr 11 08:22:45 2023 +0000" }, "message": "Fix transcode progress notification am: fe4c297054\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Media/+/22533288\n\nChange-Id: Ic399cb3bd3a8fc9a5409d923c7181ca855ea0e77\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fe4c2970542d2499524a7471d35658218e348cea", "tree": "0f31659c70f15c3d91cb2a422d4863c5e11cc913", "parents": [ "bfcf60f3f3d8c7d570031bf0c816b97d348f8aee" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Sat Apr 08 16:46:05 2023 +0000" }, "committer": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Sun Apr 09 12:16:39 2023 +0000" }, "message": "Fix transcode progress notification\n\nThe executor and listener fields are guarded by a lock, but the lock was\nnot taken out when notifying progress updates.\n\nTest: Will be tested via MediaTranscodingManagerTest but it currently fails due to b/274472195\nFixes: 277383391\nChange-Id: Ib8dce559d57564f6383c43bd1c9e2efedda7d92c\n" }, { "commit": "ce0c285dba9f88fcfcd02b5aa754d5622328db01", "tree": "09fa5548cb6299affb731223adcc1716b47071f0", "parents": [ "0b04fa3320f3df5ec42d19c75294684c048836a6", "3d9af139056e4d22d44a0211fb2b1880d21e368b" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Sat Apr 08 19:54:22 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Apr 08 19:54:22 2023 +0000" }, "message": "Merge \"Fix typo in HDR media feature javadoc\"" }, { "commit": "0b04fa3320f3df5ec42d19c75294684c048836a6", "tree": "e4da4c6cd3ecadd20949bf5bd78a5747b30cd5ee", "parents": [ "0f4a495968558fa33c4f1f8f829f48dec27d5f89", "01c048fdce7f66f6cbf324f31497db2b0742814d" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 19:08:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 19:08:17 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc am: 39cbba4d3e am: bfcf60f3f3 am: 01c048fdce\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: If682a7f4afe43b1ebd8d748d71637ad8a1ba65d8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0f4a495968558fa33c4f1f8f829f48dec27d5f89", "tree": "e4da4c6cd3ecadd20949bf5bd78a5747b30cd5ee", "parents": [ "54e6d8733d6631d1900baf635f4c2adf3d502c90", "d0757cafc8cb497a95588fff199fff8c6be3d0cc" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 19:01:14 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 19:01:14 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc am: 39cbba4d3e am: bfcf60f3f3 am: d0757cafc8\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: Icc05710546f33da4507a5961aad8a2fc25a2fa8f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d0757cafc8cb497a95588fff199fff8c6be3d0cc", "tree": "e4da4c6cd3ecadd20949bf5bd78a5747b30cd5ee", "parents": [ "4e1488eb297f11d50079d471e4d3182476b408a6", "bfcf60f3f3d8c7d570031bf0c816b97d348f8aee" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 18:26:39 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 18:26:39 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc am: 39cbba4d3e am: bfcf60f3f3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: If8e8c6591bc63fd382e1894a78a152a275ec02be\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "01c048fdce7f66f6cbf324f31497db2b0742814d", "tree": "e4da4c6cd3ecadd20949bf5bd78a5747b30cd5ee", "parents": [ "e969a7b1b57672562b3ee1f2f189614e74d57655", "bfcf60f3f3d8c7d570031bf0c816b97d348f8aee" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 18:26:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 18:26:07 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc am: 39cbba4d3e am: bfcf60f3f3\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: Id440dafcc7d1413a71d305f7ae6383c86f052b56\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bfcf60f3f3d8c7d570031bf0c816b97d348f8aee", "tree": "e4da4c6cd3ecadd20949bf5bd78a5747b30cd5ee", "parents": [ "e969a7b1b57672562b3ee1f2f189614e74d57655", "39cbba4d3e46e7e51d54448d65e3deb4b2689f58" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 17:45:58 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 17:45:58 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc am: 39cbba4d3e\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: I74146a5d910e6e0713310f3bd9191bbb989b3aec\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "39cbba4d3e46e7e51d54448d65e3deb4b2689f58", "tree": "91119bc541382a9d364bf11913f5d2328b0055ec", "parents": [ "f234823f4a0cab6da7f9479f97c5a00ffd4b6b6f", "a6670fa2dc9ca4ba75d56e7cff3b76ff6e17debc" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 17:09:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 17:09:38 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94 am: a6670fa2dc\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: I967be8a41f672711ff205b4f1e9efbb71be2b863\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a6670fa2dc9ca4ba75d56e7cff3b76ff6e17debc", "tree": "91119bc541382a9d364bf11913f5d2328b0055ec", "parents": [ "438849122322562193004a76c9aeda9e66c5702c", "d71d3c5a9488121782fa12b69056fb892aaf6877" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 16:34:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 15 16:34:35 2023 +0000" }, "message": "Use filegroup defaults for framework sources am: d71d3c5a94\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2489695\n\nChange-Id: I8dfdcd60aa3f4eaa02554b6e4d15ca65d8c5cfb6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d71d3c5a9488121782fa12b69056fb892aaf6877", "tree": "91119bc541382a9d364bf11913f5d2328b0055ec", "parents": [ "438849122322562193004a76c9aeda9e66c5702c" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 11:59:39 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Mar 15 11:59:39 2023 +0000" }, "message": "Use filegroup defaults for framework sources\n\nThere\u0027s now a shared defaults module for this kind of filegroup. Use\nthat and remove the previously duplicated prop.\n\nBug: 271816210\nTest: m\nChange-Id: Ib75d55674c65dcbff6f845073d1fae54efdc9184\n" }, { "commit": "3d9af139056e4d22d44a0211fb2b1880d21e368b", "tree": "ca7d3c7faf13eee465c302981df6113efe8eaafa", "parents": [ "54e6d8733d6631d1900baf635f4c2adf3d502c90" ], "author": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Sat Mar 11 15:44:05 2023 +0000" }, "committer": { "name": "Andrew Lewis", "email": "andrewlewis@google.com", "time": "Sun Mar 12 10:16:39 2023 +0000" }, "message": "Fix typo in HDR media feature javadoc\n\nChange-Id: I37bee5624c07999e5d3d98abb281e3036e2ae012\n" }, { "commit": "54e6d8733d6631d1900baf635f4c2adf3d502c90", "tree": "d8eac3ee89d99c7cfec3e91aa2273aea1d9b5e96", "parents": [ "d8340bdbb9e15924fba28477acc83ccf1efa384e", "4e1488eb297f11d50079d471e4d3182476b408a6" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 12:52:30 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 12:52:30 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa am: 4388491223 am: f234823f4a am: e969a7b1b5 am: 4e1488eb29\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: I282042f368a0b15b71b56eaf93098ab50b61d581\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4e1488eb297f11d50079d471e4d3182476b408a6", "tree": "d8eac3ee89d99c7cfec3e91aa2273aea1d9b5e96", "parents": [ "70f41084730f16a20ef5a124a23a50d754d983c2", "e969a7b1b57672562b3ee1f2f189614e74d57655" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 10:26:31 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 10:26:31 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa am: 4388491223 am: f234823f4a am: e969a7b1b5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: Ifb0ea511bba699e45070eda63480f01668ee648c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d8340bdbb9e15924fba28477acc83ccf1efa384e", "tree": "d8eac3ee89d99c7cfec3e91aa2273aea1d9b5e96", "parents": [ "70f41084730f16a20ef5a124a23a50d754d983c2", "e969a7b1b57672562b3ee1f2f189614e74d57655" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 10:25:26 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 10:25:26 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa am: 4388491223 am: f234823f4a am: e969a7b1b5\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: Iebcc40f5d6f05fa43a2af43cdfd07b3163d11e43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e969a7b1b57672562b3ee1f2f189614e74d57655", "tree": "d8eac3ee89d99c7cfec3e91aa2273aea1d9b5e96", "parents": [ "70f41084730f16a20ef5a124a23a50d754d983c2", "f234823f4a0cab6da7f9479f97c5a00ffd4b6b6f" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 07:39:53 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 07:39:53 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa am: 4388491223 am: f234823f4a\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: I96fa6a3ee54e65a2b9aa50bd67f19f85ab35cc2a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f234823f4a0cab6da7f9479f97c5a00ffd4b6b6f", "tree": "36161712e87cb97e39735a8c21a9a07bbbe10708", "parents": [ "f2487093cef5fd281df1a288a18b0455325e6f98", "438849122322562193004a76c9aeda9e66c5702c" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 06:26:16 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 06:26:16 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa am: 4388491223\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: I1a6d8aef4515bb2ee821bf024eb4c72ae9ef862b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "438849122322562193004a76c9aeda9e66c5702c", "tree": "36161712e87cb97e39735a8c21a9a07bbbe10708", "parents": [ "58032af4bf53037edd747ef5ff961baf97c0d83a", "6d6e55dbaaf6c623c0fb4ffde436d2aa3489729c" ], "author": { "name": "Zi Wang", "email": "mrziwang@google.com", "time": "Wed Feb 22 04:07:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 22 04:07:09 2023 +0000" }, "message": "Add permitted_packages property for java_sdk_library am: 6d6e55dbaa\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2428659\n\nChange-Id: I910a2f818a6b5799c187ef9485b7ef63e724641f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "6d6e55dbaaf6c623c0fb4ffde436d2aa3489729c" }