)]}' { "log": [ { "commit": "5b9160e96750579fe7a53553401dc9993a88f01a", "tree": "bb9677b4223823064e00d4e46506cf9933f18442", "parents": [ "fa3a20fc9dbfacf6df7a5a46d3001f1314dac140" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Mar 06 08:33:58 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Mar 06 08:33:58 2024 +0000" }, "message": "Split android_non_updatable_stubs_libs\n\nThis change moves the entries android-non-updatable-stubs-defaults.libs\nout of the module to an independent list, so that it can be utilized in\nboth stubs_default module and a java_default module. Utilization of the\njava_default module will be done in a child change.\n\nTest: m nothing\nBug: 327507877\nChange-Id: Ia8aec25c6c6a199f36a69062754f5b02b15fdb59\n" }, { "commit": "cae685c7b9b76d03c2b21aba1b5b99ea93c8963b", "tree": "f4f5baa237ed412099f79bb3534b46bacc09b77a", "parents": [ "4b2e60bca74093c7c26ccc3ab0aa4f22f5a2e782", "ff78855f526b24d13cfe6ce867147974f05ef727" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 28 23:32:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 28 23:32:21 2024 +0000" }, "message": "Merge \"Specify `stubs_type` property in java_api_library modules\" into main am: 509fa1c6d8 am: ff78855f52\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2981094\n\nChange-Id: If25eb6ca0268b3b207ab96961580083fb6f3c4c6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ff78855f526b24d13cfe6ce867147974f05ef727", "tree": "6724840ab353cab2849a188f744d0d14b2b0ea28", "parents": [ "ca0cbb96cb2771a4b4a225b84457408b97cddd75", "509fa1c6d8004b2ea8148f3b6ca06d157abd5fb3" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 28 22:50:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 28 22:50:53 2024 +0000" }, "message": "Merge \"Specify `stubs_type` property in java_api_library modules\" into main am: 509fa1c6d8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2981094\n\nChange-Id: I2d62183af207d339a7d3839793ca4366c3163639\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0d639bf1792ed94da62b0ed2cab56167a850505d", "tree": "384ced3caa7eb4aaeb3b075e13deb25ef3863ae9", "parents": [ "99965ff0f506de360d074c580faf7b5f0f2c32c1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 28 00:54:13 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 28 00:54:13 2024 +0000" }, "message": "Specify `stubs_type` property in java_api_library modules\n\nWith the effort to support non-\"everything\" stubs generation from api\nsignature files, https://r.android.com/2977092 enforces all\njava_api_library modules to specify the `stubs_type` property. In order\nto accustom to this enforcement, this change specifies the `stubs_type`\nproperty as \"everything\" to all bp-defined \"everything\" stubs generating\njava_api_library modules.\n\nTest: m nothing --no-skip-soong-tests\nBug: 319162970\nChange-Id: I0a21420b4aa9eccd1eeb2022f3c9c952f607a480\n" }, { "commit": "2962a6244fd40d53505273adcd2645b88d5fdbc9", "tree": "1aee026e1d5450bdc89cbe209fcebc1da4db1eda", "parents": [ "eb5eb85470ec24cea4d81479c41e38d82145f69a", "6af23712fd0914c7ba5f11d2905e8826ab88091f" ], "author": { "name": "Nishant Panwar", "email": "nishantpanwar@google.com", "time": "Thu Feb 22 07:43:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 07:43:41 2024 +0000" }, "message": "Merge \"Add SDK library framework-pdf-v in MediaProvider\" into main am: bd1fe2d379 am: 6af23712fd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2953269\n\nChange-Id: Ifa965c2c9f4aa2194563b30f51d89635c6824714\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6af23712fd0914c7ba5f11d2905e8826ab88091f", "tree": "b71c26d81730055d82a56472f7c65e81b22e6c9d", "parents": [ "dc735dc09d89842510dbaca66c05e805ef9058a1", "bd1fe2d379e27ad2fbde971a6aea77e1ae3ab953" ], "author": { "name": "Nishant Panwar", "email": "nishantpanwar@google.com", "time": "Thu Feb 22 07:02:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 07:02:26 2024 +0000" }, "message": "Merge \"Add SDK library framework-pdf-v in MediaProvider\" into main am: bd1fe2d379\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2953269\n\nChange-Id: I7f99efc5382f8585261a4221b65eb581da7a06e0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd1fe2d379e27ad2fbde971a6aea77e1ae3ab953", "tree": "255e460c48bdfad162b486a6c26e7b5406592465", "parents": [ "9f4ec92e13547630d85f46c9a6beaa8219cbb5ae", "81c51cf80df7f6fdf298d740f498ac8f7212086b" ], "author": { "name": "Nishant Panwar", "email": "nishantpanwar@google.com", "time": "Thu Feb 22 06:32:13 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 22 06:32:13 2024 +0000" }, "message": "Merge \"Add SDK library framework-pdf-v in MediaProvider\" into main" }, { "commit": "8ad50832cae26747e7e106c650b8874f9bd2f6a8", "tree": "b75f282d0f128fe15c6c8959f67c3704725c63e8", "parents": [ "61fc070c2523986f94b88d24c136ad83b0748fd2" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 13 23:30:42 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 15 23:32:55 2024 +0000" }, "message": "Replace lists of aconfig modules with aconfig_declarations_group\n\nCurrently in AconfigFlags.bp, two list of aconfig modules are being\nmaintained: the list of java_aconfig_library modules and the list of\naconfig_declarations modules. When a new aconfig module is being added,\na developer must modify the two lists, and there is no guarantee that\nthe two lists are kept in sync. In order to resolve such issue, this\nchange replaces the two lists with the newly introduced\naconfig_declarations_group module.\n\nTest: m\nBug: 320492079\nMerged-In: Ib32c06de4f0279a17e5c65314e984265592d004c\nChange-Id: Ib32c06de4f0279a17e5c65314e984265592d004c\n" }, { "commit": "25d562ef7452d069e5b99637f1a7dafd72c07050", "tree": "d6489a6a9a861c5eee8b93c15a049a6dae40ba9f", "parents": [ "bc608a8758030602f4dbeed2a62714c1e64ca4a0" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 13 23:30:42 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 15 18:05:25 2024 +0000" }, "message": "Replace lists of aconfig modules with aconfig_declarations_group\n\nCurrently in AconfigFlags.bp, two list of aconfig modules are being\nmaintained: the list of java_aconfig_library modules and the list of\naconfig_declarations modules. When a new aconfig module is being added,\na developer must modify the two lists, and there is no guarantee that\nthe two lists are kept in sync. In order to resolve such issue, this\nchange replaces the two lists with the newly introduced\naconfig_declarations_group module.\n\nTest: m\nBug: 320492079\nChange-Id: Ib32c06de4f0279a17e5c65314e984265592d004c\n" }, { "commit": "59a129fddb14e0bced593e5fb20b168850991e13", "tree": "12b29687bbf63d7cb7a7b9420b27842132440dde", "parents": [ "c70419afd1e9f4f1d7f62dd0bb17757e3425e8d7" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 13 23:30:42 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 15 04:12:38 2024 +0000" }, "message": "Replace lists of aconfig modules with aconfig_declarations_group\n\nCurrently in AconfigFlags.bp, two list of aconfig modules are being\nmaintained: the list of java_aconfig_library modules and the list of\naconfig_declarations modules. When a new aconfig module is being added,\na developer must modify the two lists, and there is no guarantee that\nthe two lists are kept in sync. In order to resolve such issue, this\nchange replaces the two lists with the newly introduced\naconfig_declarations_group module.\n\nTest: m\nBug: 320492079\nMerged-In: Ib32c06de4f0279a17e5c65314e984265592d004c\nChange-Id: Ib32c06de4f0279a17e5c65314e984265592d004c\n" }, { "commit": "22e41fbf6be3554532fd9d823e174aa5ecd556aa", "tree": "b5af79c973007d7b9f7901840080a76a702304e5", "parents": [ "2cace88691e12dea3ab640269cea2ca1211bfb9c", "d1f660adcb4c2dea202b46cbd5472b258d130895" ], "author": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Wed Feb 14 21:59:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 14 21:59:29 2024 +0000" }, "message": "Merge \"Set is_stubs_module for stubs modules\" into main am: d1f660adcb\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2960142\n\nChange-Id: Ia9d88d777dc74dbe5846b8e8bf357f1d57aaca2f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d1f660adcb4c2dea202b46cbd5472b258d130895", "tree": "e68ac35991e9f5707954ec003362714e8ffa0971", "parents": [ "c8354066f423f62ff2bb45170a959ea36aa45955", "a7073b50971868c0d1d96ac03cf21b2e96eaac74" ], "author": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Wed Feb 14 21:38:20 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 14 21:38:20 2024 +0000" }, "message": "Merge \"Set is_stubs_module for stubs modules\" into main" }, { "commit": "a7073b50971868c0d1d96ac03cf21b2e96eaac74", "tree": "b9f3c7ef4857a189de6f7ba2adb2e56c2c74e5e3", "parents": [ "a73a8b3a9e4d9112db4790e3c760fa56e489f229" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Feb 12 23:18:52 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 14 17:39:01 2024 +0000" }, "message": "Set is_stubs_module for stubs modules\n\nThis change sets is_stubs_module property to true for combined modules\ngenreated in `combined_apis` and non-updatable stub modules, which are\nnot generated via java_sdk_library but are maintained separately.\n\nTest: m nothing --no-skip-soong-tests\nBug: 310504781\nMerged-In: I1293208e575a76db2cc4dc6c8564369804bb4ac5\nChange-Id: I1293208e575a76db2cc4dc6c8564369804bb4ac5\n" }, { "commit": "8fa4937602971c767976fec54baab78f211632c1", "tree": "558ada85832e7648f844e49d6897df1fd9e4d062", "parents": [ "58d855dda2d2159e312aa746129cc2e094f58ae1", "daa3530b6312134f897d106b6893677b96d8ba7c" ], "author": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Wed Feb 14 00:30:47 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 14 00:30:47 2024 +0000" }, "message": "Merge \"Set is_stubs_module for stubs modules\" into main" }, { "commit": "796ec6bec2806d9f96462d5c2be28310bd2f8e60", "tree": "49b323f7e0c36b03d7eddb7e7c388622686ec624", "parents": [ "5426b2660d5ef29c93744ecc38dd1678548c7421", "cf9acc6fe36baf5a3d3d70cb04ae9a109f9c84e8" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Tue Feb 13 21:08:58 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 13 21:08:58 2024 +0000" }, "message": "Merge \"New dist target for private API stubs\" into main" }, { "commit": "cf9acc6fe36baf5a3d3d70cb04ae9a109f9c84e8", "tree": "28549d92c502d823d1108d6fa2d251365d8c8e4c", "parents": [ "59e8043a4e08b4d7dae04e08e4f9442c50344666" ], "author": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Mon Feb 12 21:13:03 2024 +0000" }, "committer": { "name": "Peter Kalauskas", "email": "peskal@google.com", "time": "Tue Feb 13 18:11:30 2024 +0000" }, "message": "New dist target for private API stubs\n\nBug: 236188940\nFlag: NONE\nTest: m private_api_stubs dist\nChange-Id: I7bfa72cd1db254a9a6d26c07a0219ce8671829f0\n" }, { "commit": "0cec62b527fbb5ec89c69cf1d49cb62ea51a3cb5", "tree": "4bfb90f1996df9363713590c103a819c6f99c268", "parents": [ "3f8951829af390346b822e45a2c0b51772c66840", "d4ea469555b485c7fde33edafe232fa156bf0db2" ], "author": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Tue Feb 13 14:03:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 14:03:16 2024 +0000" }, "message": "Merge \"Enforce bcp/sscp stubs do not compile against apps\" into main am: 4671ab97f1 am: d4ea469555\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957852\n\nChange-Id: Ieb5345611e3db1d1fdbfe5c9982dbe2d5c9684fa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d4ea469555b485c7fde33edafe232fa156bf0db2", "tree": "e78f89383a4acfffdc342c177a74858920e4f232", "parents": [ "e30d2a6184f53361801a28ad2eee80329ecb7328", "4671ab97f1185d7a8b78bfbdaeeb95ca3935de40" ], "author": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Tue Feb 13 13:52:46 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 13 13:52:46 2024 +0000" }, "message": "Merge \"Enforce bcp/sscp stubs do not compile against apps\" into main am: 4671ab97f1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2957852\n\nChange-Id: I566953cbecf3d4140708d7603d55f7f7941c09e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "daa3530b6312134f897d106b6893677b96d8ba7c", "tree": "9329c3c58a2b8ae595e9bd65365c527a82944755", "parents": [ "c8a73723476ba714efa119f35daf476f314b10c5" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Feb 12 23:18:52 2024 +0000" }, "committer": { "name": "LaMont Jones", "email": "lamontjones@google.com", "time": "Mon Feb 12 15:38:23 2024 -0800" }, "message": "Set is_stubs_module for stubs modules\n\nThis change sets is_stubs_module property to true for combined modules\ngenreated in `combined_apis` and non-updatable stub modules, which are\nnot generated via java_sdk_library but are maintained separately.\n\nTest: m nothing --no-skip-soong-tests\nBug: 310504781\nChange-Id: I1293208e575a76db2cc4dc6c8564369804bb4ac5\n" }, { "commit": "67b7906e5f4fbab2843efbb3ad145071665ab263", "tree": "91e9d3fc939dffa79572221339d297a7d63a1052", "parents": [ "81c41a0aa3aaa4f7680268e5c44e131604ad9f10" ], "author": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Mon Feb 12 11:40:51 2024 +0000" }, "committer": { "name": "Spandan Das", "email": "spandandas@google.com", "time": "Mon Feb 12 11:40:51 2024 +0000" }, "message": "Enforce bcp/sscp stubs do not compile against apps\n\nThis ensures that we do not run into circular depencies when\nUNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT\u003dtrue. When this variable\nis true, apps compile with a min_sdk_version equivalent to the sha of\nthe apis (i.e. the java_genrule `api_fingerprint`). If the api stubs are\nallowed to depend on android apps, we will run into circular deps\n\nImplementation details\n1. Modify the deps mutator of combined_apis to add a dependency on the\n stub java modules\n2. Do a graph walk in GenerateAndroidBuildActions and ensure that no\n child is an android_app. This will be determined by casting to\nAndroidLibraryDependency.\n\nRe (2): this does a graph walk via ctx.WalkDeps, but should not be\ncomputationally intensive because\n(a) We do this for a single module (i.e. combined_apis)\n(b) The transitive closure is shallow since it starts from stubs\n\nTest: presubmits\nTest: locally, added an app to libs of `service-sdksandbox` and verified\nthat the error is raised\n\nBug: 315016205\nChange-Id: Iaf35f03171d13d75e75de6e0e744fcf34e3294fd\n" }, { "commit": "81c51cf80df7f6fdf298d740f498ac8f7212086b", "tree": "3dc3941e626c7ce0638bc5a668944d4b8b8ba703", "parents": [ "034f11bb0b5f1aa9be1f6d8f6ce62bb069341729" ], "author": { "name": "Nishant Panwar", "email": "nishantpanwar@google.com", "time": "Sat Feb 10 09:12:06 2024 +0000" }, "committer": { "name": "Nishant Panwar", "email": "nishantpanwar@google.com", "time": "Sun Feb 11 09:45:19 2024 +0000" }, "message": "Add SDK library framework-pdf-v in MediaProvider\n\nSDK library for pdf related bootclasspath classes that were part of the non-updatable API before V, and were moved to the module in V. Other pdf related bootclasspath classes in mediaprovider should go to framework-pdf.\n\nBug: b/324667310\nTest: presubmit and m\nChange-Id: I3f7469ac72052e7529e998179fe57db1a5b39c82\n" }, { "commit": "cfac6e171c235b53bf696bde09808240ce574884", "tree": "d9ecf1ab56fae4a74b2ff46424ba9b0ad7b7c49a", "parents": [ "b2121237712080562f93a66407620ce5afd60157", "c990a2f001e0bc0ac852e465185a0735e7756afe" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 08 10:03:28 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 08 10:03:28 2024 +0000" }, "message": "Merge \"Add merged txt filegroups that depend on the exportable non-updatable txt files\" into main am: 9e12339d40 am: c990a2f001\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2953855\n\nChange-Id: Ic29d514a294b05e032f6d20a1c5274ec40aa6003\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c990a2f001e0bc0ac852e465185a0735e7756afe", "tree": "121767ee61f7cc0b109bb0eec1a1ef748115dea1", "parents": [ "3f761a84b063796d7348cb0b8189eabb94150883", "9e12339d403dee784659d22dce97e12f12e6b404" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 08 09:23:29 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 08 09:23:29 2024 +0000" }, "message": "Merge \"Add merged txt filegroups that depend on the exportable non-updatable txt files\" into main am: 9e12339d40\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2953855\n\nChange-Id: I13210bee77f5660c82e2c07c16e2249ea1136679\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e12339d403dee784659d22dce97e12f12e6b404", "tree": "00932e76a7be7790c778b3f7226f77d5fe3e2b73", "parents": [ "c104ba5541854565f0df9ef038810468280da033", "31cf274769ade4f5d0e823f267c84df6c48e00df" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 08 08:43:06 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 08 08:43:06 2024 +0000" }, "message": "Merge \"Add merged txt filegroups that depend on the exportable non-updatable txt files\" into main" }, { "commit": "31cf274769ade4f5d0e823f267c84df6c48e00df", "tree": "ae4def1343e59d22e68460b6cb244252a74a2d53", "parents": [ "a73a8b3a9e4d9112db4790e3c760fa56e489f229" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 07 19:52:19 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Feb 07 22:18:01 2024 +0000" }, "message": "Add merged txt filegroups that depend on the exportable non-updatable txt files\n\nCurrently, ther merged txt filegroups are dist\u0027ed as api/*-current.txt\nand api/*-removed.txt files during droid dist build.\n\nThis change adds additional merged txt filegroup modules\nthat depend on the non-updatable exportable txt files instead of\nthe checked in non-updatable txt files (under frameworks/base/core).\n\nThese added modules will be dist\u0027ed in droid build, instead of the\ncurrently existing merged txt filegroups.\n\nTest: m nothing \u0026\u0026 inspect ninja output\nBug: 324254328\nChange-Id: Ib0b47ba032a2917d0f2df6ad585d2102d6940c50\n" }, { "commit": "62b90dca4600a597ef4a9aa01a570d13fbeb9e9e", "tree": "1404dcb73e7091219ac30afe093f4ecb03f639f9", "parents": [ "ccf65e5b16ba5037ba6cba2d20c5b57027614d5b", "e76435d8c6175217c0458e63770207b0d3a737d4" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 06 23:33:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 06 23:33:59 2024 +0000" }, "message": "Merge \"Generate frameworks-base-api-current.srcjar from exportable stubs\" into main am: f4747fbaf4 am: e76435d8c6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952145\n\nChange-Id: I1b60c38e41f9a838e70b7477d39b867ffabf94e8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e76435d8c6175217c0458e63770207b0d3a737d4", "tree": "fe35f7ed837bae26c230376179773aa92024b97e", "parents": [ "b1a06182548d11427d08f21077b70c588c8c0633", "f4747fbaf4d75535e385688ea93f3b88a72dbdf9" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 06 22:50:59 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 06 22:50:59 2024 +0000" }, "message": "Merge \"Generate frameworks-base-api-current.srcjar from exportable stubs\" into main am: f4747fbaf4\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2952145\n\nChange-Id: If83d64c303e4fec130dac72bc002daa2b3425a0e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f4747fbaf4d75535e385688ea93f3b88a72dbdf9", "tree": "62628a12d3be26eab16ba6c639e5cf5c779301e7", "parents": [ "a73a8b3a9e4d9112db4790e3c760fa56e489f229", "f1f72ca1b3894045616c2dd1a16bb73ac60d86c8" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 06 21:59:11 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 06 21:59:11 2024 +0000" }, "message": "Merge \"Generate frameworks-base-api-current.srcjar from exportable stubs\" into main" }, { "commit": "f1f72ca1b3894045616c2dd1a16bb73ac60d86c8", "tree": "708a75b9a90bcc5a43ed0584235a58fb2f9cc47f", "parents": [ "ed2395aa096a06af174f8224842ae44fb2601305" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 06 00:09:38 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Feb 06 00:09:38 2024 +0000" }, "message": "Generate frameworks-base-api-current.srcjar from exportable stubs\n\nframeworks-base-api-current.srcjar is used to generate the stubs srcjar\nfile in dist directory during the sdk builds. Given that the sdk build\nartifacts should depend on the exportable stubs instead of the\neverything stubs, the src of this module should also be replaced with\nthe exportable stubs from the everything stubs.\n\nGiven that the only usage of this module is the stubs srcjar generation\nduring the sdk builds, the source of this module can be safely replaced\nwith the exportable stubs instead of creating a new module.\n\nTest: patch in git_main, lunch aosp_arm-ap31-eng \u0026\u0026 m sdk dist and inspect ninja query to verify that android-stubs-src.jar does not depend on the everything stubs\nBug: 323261972\nChange-Id: If37aa6ef862c69619768f91f2360b37459fd3cdb\n" }, { "commit": "6139d58767f26552c9ae12a5893e01e180d78041", "tree": "f0d24c56c9f1647d80ce51110bdd7a938b1a90e9", "parents": [ "9f7d0a7f3add47085586146fe0e89011c98d941e", "ad675e39346ebbd801df9de423a508da13148f63" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Feb 02 21:15:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 21:15:58 2024 +0000" }, "message": "Merge \"Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions\" into main am: 45e63e8fad am: ad675e3934\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2945115\n\nChange-Id: Ic7b0718caa1818d04f24570e15a2b89e0f23eea5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "ad675e39346ebbd801df9de423a508da13148f63", "tree": "73d3313afb3c3bfc51e8edc332505e1b953a0503", "parents": [ "063c174b178629df4de39cd0bff8a9af4823625c", "45e63e8fad7a67b9578425388d355642c6c89c6c" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Feb 02 20:38:00 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 02 20:38:00 2024 +0000" }, "message": "Merge \"Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions\" into main am: 45e63e8fad\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2945115\n\nChange-Id: Ifd3b9572c10066036463653531ebc4318b4fd5e3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "45e63e8fad7a67b9578425388d355642c6c89c6c", "tree": "18a46c190705ac03926f3ba079dfaf289a8f322d", "parents": [ "79d72bd072d7e53a9231f5af2b7b550fce43556c", "2a829bb51e36c70ee5914da08b568f4055169536" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Feb 02 19:51:14 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 02 19:51:14 2024 +0000" }, "message": "Merge \"Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions\" into main" }, { "commit": "2a829bb51e36c70ee5914da08b568f4055169536", "tree": "4def3022f0e21ad9cb2a52ecc6efe60beccedf0e", "parents": [ "ed2395aa096a06af174f8224842ae44fb2601305" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Feb 01 22:01:15 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Feb 02 07:28:23 2024 +0000" }, "message": "Modify sdk-annotations-*.zip and android_*_stbs_current_with_test_libs defintions\n\nThis change modifies the sdk-annotations-*.zip definitions so that the\nmodules depend on the exportable annotations.zip files instead of the\neverything annotations.zip files.\n\nThis change also modifies the definition of the\nandroid_*_stubs_current_with_test_libs modules definitions to depend on\nthe exportable stubs.\n\nLikewise, the droiddoc modules now depend on the exportable stubs.\n\nTest: m docs dist \u0026\u0026 inspect ninja file to verify that everything stubs are not exported\nTest: m sdk dist \u0026\u0026 inspect api-versions.xml file and verify that the disabled apis are not included\nBug: 323261972\nChange-Id: I015921f0d006bac29492be22b83043b39a8fe8eb\n" }, { "commit": "5221496f142111e47e2d7b8fad1151763dd7f443", "tree": "c7a044a8fec80e0878e37b729bce3fe39890d14f", "parents": [ "a9b3c063610331b221944bc24c64fa80d9c1e511", "96dac95fc12332513bacf2047758df53ff1acbf2" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Jan 31 18:49:36 2024 +0000" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Feb 01 18:40:52 2024 +0000" }, "message": "framework-nfc: Switch to \"framework-module-defaults\" am: 96dac95fc1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2863748\n\nMerged-In: I8bd5e38b1482600594c41660d14537cf15b48318\nChange-Id: Ie96315990595f1405a1e8a4c7f184596dc3a572b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b0540e871a4bddc2bc7fd2eba8d2911596bd9e5d", "tree": "9bdd3441e7d398ec384f670326b67df093cefac9", "parents": [ "1f13c158cd73bbe026b38453e03b8b87f6d48ca1" ], "author": { "name": "Yisroel Forta", "email": "yforta@google.com", "time": "Tue Jan 30 16:22:06 2024 +0000" }, "committer": { "name": "Yisroel Forta", "email": "yforta@google.com", "time": "Thu Feb 01 03:42:11 2024 +0000" }, "message": "Add profiling module to bootclasspath\n\nTest: m, presubmit\nBug: 293957254\nChange-Id: I50d024c167094dc559070f529a91af6e9cb49872\n" }, { "commit": "04a158bf3018869511634e08a28d25cc27aac962", "tree": "e59484dccd66dd00a8030e95a1b06e6c30cc2b00", "parents": [ "2c67c1cda0189264c901ca19b171edd43e916e1b", "2537350b9e6e459c4538ea74c64c6d40f1573920" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 31 17:59:33 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 31 17:59:33 2024 +0000" }, "message": "Merge changes from topic \"framework-nfc-updatable\" into main\n\n* changes:\n nfc(api): Move NFC API lint baseline\n nfc(api): Move nfc classes to framework-nfc\n framework-nfc: Switch to \"framework-module-defaults\"\n" }, { "commit": "7b647e4ea0e92f33c19b315eaed364ee067ba0aa", "tree": "47c285aa18cf79476d615f8e169ebd823bee6d38", "parents": [ "46deec9f696f850efdd4427e10db145d68cbb5bd", "efd99108901ae47b085f96c841214f6f416dd86f" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:36:03 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Jan 30 10:36:03 2024 -0800" }, "message": "Merge Android 24Q1 Release (ab/11220357)\n\nBug: 319669529\nMerged-In: I46c7859ff042ee7aa9193757e5df8269f4892362\nChange-Id: I0c7b5036c0b0f5f2caad551edb063350f6eb87e7\n" }, { "commit": "85e169c3358b215f7cb50b05d21702964ab4247f", "tree": "e4b8400c411e2ea4c2160142a1eb2d2927293bb5", "parents": [ "4453934e28d94a2c8e2597f18284dd59833d0955", "c537cba76b99f2ae7fdd41d8a855935792256619" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Jan 23 23:30:42 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 23 23:30:42 2024 +0000" }, "message": "Merge \"Add aconfig declarations to f/b droidstubs\" into main" }, { "commit": "1f4501f6c05e4ee197cdd68dc026b6f3af830a9d", "tree": "3133e93e8befadd83fe1de87a659424d01579d64", "parents": [ "dd7cd7c03a41302a843889bdf59d70814afe9e46" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Tue Dec 12 06:28:48 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Thu Jan 18 11:26:09 2024 +0000" }, "message": "Revert^2 \"[CrashRecovery] Add module lib to Android SDK\"\n\ned0743daac4104dcfbfd781a2d6b298b21e6d038\n\nBug:b/289203818\nTest: m nothing\n\nChange-Id: Id156c0fd4b7b783c5b9f1488914f5650e30ffed5\nMerged-In: If6789fee9a908231babd7624280b40515d377dfe\n" }, { "commit": "8bd00f3f033bcd0b2663ae3e33f25db9dc15e2bf", "tree": "c8d6a711d0ca3ac87b17c07a38305a2b7811219c", "parents": [ "75ef8221d0c137e2de7fcd6409cc09ce51e89630", "919593c804c3536f6f0309a03b266aa7968d4b8c" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Thu Jan 18 11:25:35 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Jan 18 11:25:35 2024 +0000" }, "message": "Merge \"[CrashRecovery] Add module lib to Android SDK\" into main" }, { "commit": "919593c804c3536f6f0309a03b266aa7968d4b8c", "tree": "54904de31ec1c8a67c7bf4ba53d3c7e2042121d8", "parents": [ "6969fe070336d5f39616dba8eadd104617d1d852" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Jan 17 15:52:22 2024 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Jan 17 15:52:33 2024 +0000" }, "message": "[CrashRecovery] Add module lib to Android SDK\n\nAdding the module libraries to combined_apis for them to be added to\nAndroid SDK.\nAlso adding bootclasspath-fragment to platform-bootclasspath.\n\nBug: b/289203818\nChange-Id: If6789fee9a908231babd7624280b40515d377dfe\nTest: m\n" }, { "commit": "c537cba76b99f2ae7fdd41d8a855935792256619", "tree": "5b086131f374e33cc40914fa8099d4c9811d46c6", "parents": [ "4c2e9d3ce026822fbdc7bac25572a800f4f51f4d" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Dec 21 01:22:54 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Jan 16 02:27:34 2024 +0000" }, "message": "Add aconfig declarations to f/b droidstubs\n\nThis change pass the aconfig_declaration modules defined in\nAconfigFlags.bp to the *-api-stubs-docs-non-updatable droidstubs module,\nso that the \"exportable\" stubs (i.e. the stubs only containing the\nflagged apis that are enabled by the release configuration) can be\ngenerated.\n\nTest: m api-stubs-docs-non-updatable \u0026\u0026 m checkapi\nBug: 317290555\nMerged-In: I944d336e474b9ed61f4554fc9325a8df3a9cf40b\nChange-Id: I944d336e474b9ed61f4554fc9325a8df3a9cf40b\n" }, { "commit": "46c6fdd5959986be27786e6eeebe3fab494182a1", "tree": "a3425da260c48b9999413700ff027ed98f4ed895", "parents": [ "308de078f98cc32135909497ef5106232260a9d0" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Jan 16 02:25:51 2024 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Jan 16 02:25:51 2024 +0000" }, "message": "Add aconfig declarations to f/b droidstubs\n\nThis change pass the aconfig_declaration modules defined in\nAconfigFlags.bp to the *-api-stubs-docs-non-updatable droidstubs module,\nso that the \"exportable\" stubs (i.e. the stubs only containing the\nflagged apis that are enabled by the release configuration) can be\ngenerated.\n\nTest: m api-stubs-docs-non-updatable \u0026\u0026 m checkapi\nBug: 317290555\nChange-Id: I944d336e474b9ed61f4554fc9325a8df3a9cf40b\n" }, { "commit": "e1abb628c753f9560707e625831a22e4be932b41", "tree": "b80dfb42c1a5bba77707cb11b5eeceb2919269ef", "parents": [ "d8b2ac7940b00d71ce29840d40b0049c5a3213d3", "482ed8e5e0ba88a769b00c84bbf58505fffe7d08" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Sat Jan 13 03:27:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Jan 13 03:27:12 2024 +0000" }, "message": "Merge \"Define exportable full api surface stubs\" into main am: 583bc7179d am: c9b8fd51f7 am: 482ed8e5e0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2890554\n\nChange-Id: Ifeadec8a3ace64380042449c61f60efc66aae515\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "583bc7179d830789c474583233001ff430b0d4ff", "tree": "31dff5dbd44370b99396e5f7fe9df88c7acba23c", "parents": [ "2452ea37f0d698cdbf240f7a888ee1a2f6f07fe2", "059b9493e382b1aa247907aa9028687f6d780c05" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Jan 12 23:50:37 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 12 23:50:37 2024 +0000" }, "message": "Merge \"Define exportable full api surface stubs\" into main" }, { "commit": "96dac95fc12332513bacf2047758df53ff1acbf2", "tree": "3c1887a0f8c5406c19dd984e25be9f22e8d9755e", "parents": [ "f766981533742c4b46b7d3a491ecc9baeac01f6b" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Dec 07 10:54:05 2023 -0800" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Jan 12 10:28:02 2024 -0800" }, "message": "framework-nfc: Switch to \"framework-module-defaults\"\n\nNow that all the @hide usage of NFC API\u0027s from rest of platform is\ncleaned out, we can now switch to the module defaults and continue the\nseparation of NFC API classes.\n\nBug: 303286040\nTest: Compiles\nMerged-In: I8bd5e38b1482600594c41660d14537cf15b48318\n\nChange-Id: I8bd5e38b1482600594c41660d14537cf15b48318\n" }, { "commit": "9f2a7007bec7f09df1ea4757431fc20333778cec", "tree": "166c15a61cfe6bd2a28364587fabad2d62cfd501", "parents": [ "26a91ad07238561bff7f1c87fc3a3add16f1a316", "0f7fa6a23dec3284a96274880d59ee879c48532a" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Jan 12 17:37:55 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 12 17:37:55 2024 +0000" }, "message": "Merge changes from topic \"framework-nfc-updatable\" into main\n\n* changes:\n nfc(api): Move NFC API lint baseline\n nfc(api): Move nfc classes to framework-nfc\n framework-nfc: Switch to \"framework-module-defaults\"\n" }, { "commit": "dbd941f78c39512226318a4c5019b19386a0ac50", "tree": "870a7a7eb7d8f3fb112f0db7b1ea4e2f5f4cc899", "parents": [ "7450a3d935c4d49da37c3a806fc1f79a9f4a4338", "f8ab5ab4e51377cb4205e12f3e305991fdd8ba95" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Jan 11 14:12:36 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 14:12:36 2024 +0000" }, "message": "Merge \"(Temporarily) hide Lint 101 errors\" into main am: 61e5336ae1 am: f13f82700d am: f8ab5ab4e5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2904909\n\nChange-Id: I20e0c97f283a6c5c3cba73a5d0901ecb6b9c8b4b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd193df7d99a69772d1c75cafbce82714dfe019e", "tree": "183d8760f8bf7b28de6aff131ebc65f48789410b", "parents": [ "016cbf408f1acd7b3ffdb3ecda68abcc394784b3", "97d9a8996c2c5cdae5e54a2ae1c2a8f1defa86b6" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Thu Jan 11 10:54:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 11 10:54:26 2024 +0000" }, "message": "Merge \"Add combined_api_defaults module type\" into main am: 364446fa7a am: ceaff1ca1a am: 97d9a8996c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2882815\n\nChange-Id: Idd5f35d403860811b4277b95f66373a929ee847d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e2da2d6283be58085b062b3acb5c631c6e1a4de0", "tree": "d4f1fb769ed61fbf34fb6149fe1bb94fa1830ea4", "parents": [ "364446fa7a61192cab5e53feb73a8793c7b06b6a" ], "author": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Jan 11 09:53:59 2024 +0100" }, "committer": { "name": "Mårten Kongstad", "email": "amhk@google.com", "time": "Thu Jan 11 10:01:09 2024 +0100" }, "message": "(Temporarily) hide Lint 101 errors\n\nWhen building SDKs that include some, but not all @FlaggedApis, a few\nJavadoc @see/@link references will point to objects that are\ninaccessible, which will trigger Lint 101 errors.\n\nThe correct fix is to update the Javadoc. However, to unblock the SDK\nbuild for now, temporarily hide Lint 101 errors.\n\nBug: 319541666\nTest: m sdk dist\nChange-Id: Icbd1d99d5fcd6cee37bf588ef45443e7e946f742\n" }, { "commit": "059b9493e382b1aa247907aa9028687f6d780c05", "tree": "9abf0a51e3f74a5625dd75603646f2ea4caf22c0", "parents": [ "4c2e9d3ce026822fbdc7bac25572a800f4f51f4d" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Dec 29 00:40:34 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Jan 11 00:52:26 2024 +0000" }, "message": "Define exportable full api surface stubs\n\nThe two major roles of the full api surface stubs (i.e.\nandroid_*_stubs_current) are:\n- Appended to classpath when a module sets sdk_version\n- Input to generating hiddenapi flags and determine the accessibility of\n the api at runtime\n\nWith Trunk Stable, all flagged apis that are not enabled should not be\naccessible at runtime. In other words, the currently existing full api\nsurface stubs that include both non flagged and flagged apis should not\nbe used to generate the hiddenapi flags.\n\nTo resolve this problem, this change introduces full api surface stubs\nof the \"exportable\" stubs (i.e. non flagged apis + flagged apis enabled\nby release configuration).\n\nThe new modules are named similarly to the currently existing full api\nsurface stubs, but appends the \"_exportable\" prefix to differentiate\nwith the currently existing modules. These modules are solely used for\nhiddenapi flags generation, and the currently existing modules continue\nto serve the first aforementioned role.\n\nThe new modules will toggle between the from-text stubs module and the\nfrom-source stubs module when the exportable stubs can be generated from\nthe from-text stubs generating `java_api_library` module. For now, these\nmodules are always built from source.\n\nTest: m android_stubs_current_exportable\nBug: 317426356\nChange-Id: I1f6f738ae9c5ebf151a1554aa1e357ef0092c89c\n" }, { "commit": "b52adbcd8bf41f4cd4e061b3ae853b49cbb1c678", "tree": "f526f1bf38bfaba6a56ad09d8e25ef6e6c070b5f", "parents": [ "2ab8f35e511712b6ce1edb4a87a87d426dcd7ac1" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Fri Dec 15 21:56:42 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Jan 10 20:50:12 2024 +0000" }, "message": "Add combined_api_defaults module type\n\nAllow specifying default combined api properties. This would be currently used to control the enablement of new mainline modules\n\nBug:b/289203818\nTest: verified locally\nChange-Id: I9415140453ce04efd5461cb8684c70e987810ecc\n" }, { "commit": "05836fad4a8c41456c0367144f4a47f61183c6e2", "tree": "8e01da32aba77e554cabae6159ccda143ec403c2", "parents": [ "3bfa589443bcac0c6031b8f73a113acd54412218" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Thu Dec 07 10:54:05 2023 -0800" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Wed Jan 10 11:38:15 2024 -0800" }, "message": "framework-nfc: Switch to \"framework-module-defaults\"\n\nNow that all the @hide usage of NFC API\u0027s from rest of platform is\ncleaned out, we can now switch to the module defaults and continue the\nseparation of NFC API classes.\n\nBug: 303286040\nTest: Compiles\nChange-Id: I8bd5e38b1482600594c41660d14537cf15b48318\n" }, { "commit": "2ebecc2b384915bd5857efaae4305696ce4e7749", "tree": "774b8627e8af843c8e8800e600fd3f54ed3fe15f", "parents": [ "1609fc2887fecd4e93aa2a34b95b007a28ec3958", "f4a7d228fb0e76ceb6a89a42855ca9d9c90e203d" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 03:57:41 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 10 03:57:41 2024 +0000" }, "message": "Merge \"Convert .PHONY target of `checkapi ` to Android.bp\" into main am: 4c2e9d3ce0 am: 26ce6c15ca am: f4a7d228fb\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2884406\n\nChange-Id: Ia73db3075a9cac1fbd18b193721aaeb8292fe31a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c2e9d3ce026822fbdc7bac25572a800f4f51f4d", "tree": "f71d6d9a454d29e7e03d6293f8f334cb4f0337ba", "parents": [ "eed159fcf19ab92e1e890857adf0b3c64a019441", "cb9a5dd7af10726259f83ac74d5ffe08a38320b2" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Jan 10 01:08:54 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Jan 10 01:08:54 2024 +0000" }, "message": "Merge \"Convert .PHONY target of `checkapi ` to Android.bp\" into main" }, { "commit": "c796e8e989b5925a8fa690dd78f297f4dbad276b", "tree": "a15b6841bc1d6db21e5bcf9c69a1ebbbe737e6a9", "parents": [ "84343c4ff1dbf6e4c15b3b81839394a8df72e86c", "e68d6e12706a018b647659bbe2018178208537de" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jan 09 09:45:15 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 09 09:45:15 2024 +0000" }, "message": "Merge \"Update path in comment\" into main am: 05a86a078e am: b5e3956894 am: e68d6e1270\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2901311\n\nChange-Id: I3d4d221aacc4926b60be7ff3e05c2fba0ac2ab77\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05a86a078ed33eb7889c30669abce59e8b9f25f1", "tree": "4d54eb8e60b03a4294134c94f827d51b63a1bc8b", "parents": [ "523c415c76e94854ad2cde780bbd4a6c09f5904c", "24e730fcaed0a82793c21eb07f0e36f3413980c7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Jan 09 07:16:28 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Jan 09 07:16:28 2024 +0000" }, "message": "Merge \"Update path in comment\" into main" }, { "commit": "24e730fcaed0a82793c21eb07f0e36f3413980c7", "tree": "54ba8bfb31aa937ba2eb4593bd5bf1bfc4e79742", "parents": [ "f45ca2ce2d4ee99120af059c9bf98252ffa2b157" ], "author": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Jan 08 14:11:11 2024 -0800" }, "committer": { "name": "Cole Faust", "email": "colefaust@google.com", "time": "Mon Jan 08 14:11:11 2024 -0800" }, "message": "Update path in comment\n\nThis android.bp file was moved, and the comment needs to be updated\nto reflect that.\n\nTest: Presubmits\nChange-Id: I225690505ccbf0f2234e65cbc668ade9bfbd5e17\n" }, { "commit": "f12c77187645f9390c1d937a13ca2dbbc1c44ec7", "tree": "7b32de8f8b442ddb59817b7e812f13ca48fcd338", "parents": [ "706f1eadd07865ff2819b5e4ccd2d1b55480f267", "004ccfddb130d9043b8c1e07afb219f6224cb13a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Jan 05 23:23:22 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 05 23:23:22 2024 +0000" }, "message": "Merge \"Copy system version of the api-versions.xml file to dist\" into main am: 297adbeeb0 am: f49173076f am: 004ccfddb1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2899613\n\nChange-Id: I55c28166bc3389d59f07456e4a364b3261ac590b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75f63607f386f46f6e95e8663a9188b2e53470b7", "tree": "d536b0f27fb576d1bc2253e147059814cc9ab093", "parents": [ "a9ede36fac28b8215f02d2ab38162d06bcadbc6b" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Jan 05 18:15:59 2024 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Fri Jan 05 18:18:15 2024 +0000" }, "message": "Copy system version of the api-versions.xml file to dist\n\nCopies the system version of the `api-versions.xml` file to a file\n`api-versions_system.xml` in the top level dist directory.\n\nBug: 190665366\nTest: m sdk dist\n # Check to make sure that the file exists.\nChange-Id: Ie139f81a819eb5f389363ffdefa7bc42d36804e0\n" }, { "commit": "cb9a5dd7af10726259f83ac74d5ffe08a38320b2", "tree": "75bb4a38db99513844fc7d675fdd49200918b7e3", "parents": [ "44a679e5e041b0ba8d4f1a5609da534afe85965c" ], "author": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Wed Dec 20 02:59:27 2023 +0000" }, "committer": { "name": "Nelson Li", "email": "nelsonli@google.com", "time": "Tue Jan 02 06:06:02 2024 +0000" }, "message": "Convert .PHONY target of `checkapi ` to Android.bp\n\nSince Soong has been able to correctly add dependencies to .PHONY\ntargets since aosp/2884366, it is now possible to directly use\n`phony_deps` to add the genrules used by `checkapi` to its dependencies\nand convert them to Android.bp.\n\nBug: 309730110\nTest: m checkapi\nChange-Id: Ideb9f647415423a5864d221b85442b995ac67906\n" }, { "commit": "96483c710fecd936da788183da65840bf995517c", "tree": "b0e1ac43e5ce4a9884d54ae4b7a6ab34f599d443", "parents": [ "914c3bc992f3fd32f2d45074128559c4b701c457", "e15bfe9fd190b9deacca8ca507056a830fa468d6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Dec 19 23:29:52 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 19 23:29:52 2023 +0000" }, "message": "Merge \"Remove unnecessary --api-lint-ignore-prefix options\" into main am: 4f26596894 am: 8c939d594e am: e15bfe9fd1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2880166\n\nChange-Id: Ic8ffcb211fb40546bab9a31114d0b28aaf4f7b80\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "48fefdd2cde1bf0e7f3075c23dbd4cf148f31570", "tree": "ed7af5406052b9e7b7305fd3cf2bb6c578f8e460", "parents": [ "ce4a43498f694fc5f85fbf684b312713f1840520" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Dec 18 11:38:31 2023 +0000" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Tue Dec 19 13:45:35 2023 +0000" }, "message": "Remove unnecessary --api-lint-ignore-prefix options\n\nThe `--api-lint-ignore-prefix` option adds a package prefix within\nwhich API lint checks will be ignored. However, the options are\nnot actually necessary. That is because they are only used in the\n`android-non-updatable-stubs-defaults` and the non updatable code does\nnot include any source classes from those packages.\n\nWhile modules that do use `android-non-updatable-stubs-defaults` do\ninclude classes from those packages on the classpath they are already\nexcluded from having API lint checks performed on them as they do not\ncontribute to the API surface being generated by those modules.\n\nBug: 311690008\nTest: m checkapi\nChange-Id: Ife750c586edc2b5af92c0b5e9211b23345083f69\n" }, { "commit": "5d65571af9486037c823d06a3853b32328e6ab5f", "tree": "3f8c4097686e4e7cbb8e1ac3bca79e4981999642", "parents": [ "a8f70881f089e42705dde5ab0a41de9c00b6ad28", "10fbadbd54325e8c9e59ecee018553af99b76b78" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Dec 14 19:04:20 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 14 19:04:20 2023 +0000" }, "message": "Merge \"Rename to match internal storage format.\" into main am: 778002bde8 am: 05757a85be am: 10fbadbd54\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2874862\n\nChange-Id: I4db1380b72ef9a6ab29d04bc143323233a5398cb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "990fd8dd114548ab80ccc11dfd4a2b87d79d748b", "tree": "59501e95088c62342cad2ed153f782b053c94a35", "parents": [ "0b50679bdf82dc0bf69a91cdcab2814ca0383aaa" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Wed Dec 13 23:48:56 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Dec 14 01:29:01 2023 +0000" }, "message": "Rename to match internal storage format.\n\nBug: 312784289\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: Ibc2e1af9c3346543365ce42058b6e5913161da9f\n" }, { "commit": "ebfc5cb01159a74be5507c610315618ad19f6b0e", "tree": "6464efbd9eecf9897a6e52765b8fae0d6be32cde", "parents": [ "da3e9759ff9074837e7ea1935714c75d8f6ce30b", "86306a5e3db8197f8289429119169e92c28b0d75" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Dec 12 00:29:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 12 00:29:44 2023 +0000" }, "message": "Merge \"Remove bp2build from frameworks/base/api/\" into main am: 46f743d127 am: d058f9184b am: 86306a5e3d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2864847\n\nChange-Id: I5abf81fb343a118bf43ae85184416f6ee431d11b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "46f743d1276d7aed3f5c77f11ef409d98946cc49", "tree": "5a87e67a8ce092c383f802569a5b56c21bc82749", "parents": [ "c809fceefd3e481d5d6a5a2c68746398c7cfc40c", "c6420766f0a5755bd9d1f3701d198e12231dbd67" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Dec 11 23:12:53 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Dec 11 23:12:53 2023 +0000" }, "message": "Merge \"Remove bp2build from frameworks/base/api/\" into main" }, { "commit": "04bf67ad4dc58bd2cbc7fcdd492c313f8c0b736b", "tree": "e9970293ad6add83b466bc593ac95d278320460b", "parents": [ "61360f5c8035531f8dd030ef4b7c4d5939006039", "4b8ca6a75b2d575bf476e802cef3871e6d044edf" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 18:22:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 08 18:22:02 2023 +0000" }, "message": "Merge \"Change API format in the map file.\" into main am: 2be985dfdb am: 2d0888c858 am: 4b8ca6a75b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2862679\n\nChange-Id: I04e991ffc54a48d284fe746746954bfe777798f1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2be985dfdb4a6e5fe621fb281149a5d00ab167aa", "tree": "eefdff2f8da496600b45003e72d123260ce37173", "parents": [ "52553becb6fe08627cb3410b0b37ac2fa0d461ac", "090155e821aa6c0cbed99c96c265f4ee55c73a7a" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 16:45:46 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 08 16:45:46 2023 +0000" }, "message": "Merge \"Change API format in the map file.\" into main" }, { "commit": "090155e821aa6c0cbed99c96c265f4ee55c73a7a", "tree": "0fe2c5ba0192d4bf851f825904ae3421299547c8", "parents": [ "f5d3064cee0ea3ee0a318f735896e67327c24cdb" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 08:29:41 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Fri Dec 08 08:40:18 2023 +0000" }, "message": "Change API format in the map file.\n\n* Parameter list should be a part of the API signature.\n* Package, class, and method names are stored separately so they don\u0027t\n need to be parsed when being read.\n\nBug: 315412454\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: I769cc10831f1c50c71e71cbaadec355f21258baf\n" }, { "commit": "c6420766f0a5755bd9d1f3701d198e12231dbd67", "tree": "da872f16a76b95b3aee60ce2c614a74187bba4fc", "parents": [ "82eae7148477a47db1316e6cc3a4717cd2b73773" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Dec 07 12:38:40 2023 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Dec 07 16:56:07 2023 -0800" }, "message": "Remove bp2build from frameworks/base/api/\n\nBug: 315353489\nTest: m blueprint_tests\nChange-Id: I50d938017203ad12198d8a6373c9aef80a8535c6\n" }, { "commit": "a7a5a2619901d1973c4e5376c4fe050822fbe773", "tree": "bd77c4801f2c943772824b90ab13aba4dbb54320", "parents": [ "c30dff8f85b6e365fb1b281daad75014265ee53f", "0fa80893dadb5a1fd8cbd87cc45eab80679f5879" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Dec 01 17:12:39 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 01 17:12:39 2023 +0000" }, "message": "Merge \"Created empty framework-nfc non-updatable module\" into main" }, { "commit": "5d0a8ce41abc6486096162bf5482b8c9193210a0", "tree": "8d4a33b6ebbfe7d5f3dee4c4ab01d001db760f95", "parents": [ "8c77acaa352332d5f500cc248cf991b299ec2790", "efec37bbedee73f05aeeaf6a3ea994982ddb77b6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 27 16:10:53 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 27 16:10:53 2023 +0000" }, "message": "Merge \"Remove appsearch entries in baseline\" into main" }, { "commit": "685e389659518bae3c947d8ac25ae68be3d9a821", "tree": "d0e0067fb23764154409f9e673c3507dfa7f56ee", "parents": [ "98087d61570dcfb1320ee04a6170d8aeb0d632b6", "4ea2176370d63454de915d92cd391040ec7a0b82" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Tue Nov 21 18:04:22 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 21 18:04:22 2023 +0000" }, "message": "Merge \"Extract flagged APIs in the nested classes.\" into main am: f5d3064cee am: f887ecf280 am: 4ea2176370\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2834807\n\nChange-Id: I881de4eca6ad9673bb1d1a0ee7dc5bc63a5799d3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f5d3064cee0ea3ee0a318f735896e67327c24cdb", "tree": "601e3b45fbf03b76dc839dd6b51c6000caa1e93b", "parents": [ "47cf4f1645b536a7c4824a33eae0f9e3f7acdc81", "74068a17b94e475d113a1ed5314a78bdce39c8de" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Tue Nov 21 17:01:36 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Nov 21 17:01:36 2023 +0000" }, "message": "Merge \"Extract flagged APIs in the nested classes.\" into main" }, { "commit": "79faee967bea75045402c1ad6d71ee19b9954b77", "tree": "1be675750ffc7b296c001ab00122f385b13640d1", "parents": [ "8689962f1d03ebb6f67a09ccc5178df7ef6fe576", "f97a85415caed3632fc9bfda3711b5ed92098060" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 23:05:51 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 20 23:05:51 2023 +0000" }, "message": "Merge \"Build flag to API mapping files.\" into main am: 25783f370d am: 1121e8a0f2 am: f97a85415c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2837303\n\nChange-Id: Icdee949059d6bd7c1714ddcd8386833a01e8ea66\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "25783f370d3700d21e240af03fb151fd6013bbe8", "tree": "6e9203026a0512af7e42e087e785c6f41b37791c", "parents": [ "67bb3d4e5d6d720364f472c1d62f9d437c48215b", "ea84fc8143136fd314e56e8d877a3f7f031e0724" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 21:23:21 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Nov 20 21:23:21 2023 +0000" }, "message": "Merge \"Build flag to API mapping files.\" into main" }, { "commit": "ea84fc8143136fd314e56e8d877a3f7f031e0724", "tree": "0cb22b7796fa85c5c359ae5be51bce79b8a948a6", "parents": [ "5c8faa654da42b78960e9563c5ad156835492a1e" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 08:01:56 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 08:52:06 2023 +0000" }, "message": "Build flag to API mapping files.\n\nFlag to API mapping files will be built and uploaded to `droid` target.\n\nTest: m flag-api-mapping-PublicApi\n m flag-api-mapping-SystemApi\n m flag-api-mapping-ModuleLibApi\n m flag-api-mapping-SystemServerApi\nBug; 311059624\n\nChange-Id: Ibb872e2c1f7772af59427bcec3ce6f6551a8dd17\n" }, { "commit": "74068a17b94e475d113a1ed5314a78bdce39c8de", "tree": "2b9c95f670a42a29bc6033908ff404b4d3a983b3", "parents": [ "5c8faa654da42b78960e9563c5ad156835492a1e" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 07:47:25 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Mon Nov 20 07:47:25 2023 +0000" }, "message": "Extract flagged APIs in the nested classes.\n\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nBug: 311059624\nChange-Id: I7db4296e4ee78268b886b83cd822d8ebe151c4a5\n" }, { "commit": "0fa80893dadb5a1fd8cbd87cc45eab80679f5879", "tree": "9f1c26f71409a79caa25261c1a8412868b383951", "parents": [ "f580f13013559ddb682e1a9e36171e578412bfcb" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Nov 14 14:30:26 2023 -0800" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Nov 17 14:53:18 2023 -0800" }, "message": "Created empty framework-nfc non-updatable module\n\nBug: 303286040\nTest: Device boots up after flashing\nMerged-In: Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e\n\nChange-Id: Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e\n" }, { "commit": "f3e29a8902edd63227d02303959ad010354b0037", "tree": "6dbb0b99feb3459eb4e088415e08dc0d751009c1", "parents": [ "844c81089dc4836fc8a18f91c54ba91855a183a0", "354b10b1b01ed5c372c9d97642ddc47547eaae3e" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Nov 17 22:43:32 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 17 22:43:32 2023 +0000" }, "message": "Merge \"Created empty framework-nfc non-updatable module\" into main" }, { "commit": "354b10b1b01ed5c372c9d97642ddc47547eaae3e", "tree": "46484b2eed81a07cf422f60926e8902e61063a42", "parents": [ "1744218ee37bb8dbe3867f8c9c98890309c2aa77" ], "author": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Tue Nov 14 14:30:26 2023 -0800" }, "committer": { "name": "Roshan Pius", "email": "rpius@google.com", "time": "Fri Nov 17 06:42:43 2023 -0800" }, "message": "Created empty framework-nfc non-updatable module\n\nBug: 303286040\nTest: Device boots up after flashing\nChange-Id: Iad08614f0aa3b7bea12a1ad52debd0ee13302a8e\n" }, { "commit": "92a9f0510f39dde9331c4253cea094ee658f80b8", "tree": "c2aaa61d2566a239f2ace1fbf9dd6cc626ad66bd", "parents": [ "e13a988ffd365faa5ecfdabd7da910c8c8532b4e", "2aee849050c817e2f60682cf4dd2c0ed95e40d8f" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Fri Nov 17 11:40:04 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Nov 17 11:40:04 2023 +0000" }, "message": "Merge \"Revert \"Revert \"Added new framework-pdf jar inside MediaProvider...\"\" into main am: 39c4a124d4 am: ff00cb5642 am: 2aee849050\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2822535\n\nChange-Id: If3b39e88274d2de0f7ec156175f2e537bb33ba4e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "39c4a124d4144870678c1af401d6f82321b28fe8", "tree": "2d4bf7d369a53639bc3a7ab388f7663f8bfe1643", "parents": [ "d4edff2661a7a9de7e79035d2b81afbcd7af5c14", "468a6f7f4b7fd32f09bb78b021fc9a23e411d6b1" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Fri Nov 17 10:30:16 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Nov 17 10:30:16 2023 +0000" }, "message": "Merge \"Revert \"Revert \"Added new framework-pdf jar inside MediaProvider...\"\" into main" }, { "commit": "28aae17de8e5f5072d43bafeebef92d5bedfddd8", "tree": "1c51b02b85c159c961a8f19eb7b329ffd1d697e8", "parents": [ "e749187514b90ad38193d902fcd603cf1aaf6a4b", "f7155dd52b8b5898a2d625fa67920c6ccd522634" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Nov 16 20:16:27 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Nov 16 20:16:27 2023 +0000" }, "message": "Merge \"Extract the mapping of flags to APIs.\" into main am: 2563720cb5 am: d06f50f93e am: f7155dd52b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2831006\n\nChange-Id: Ic98c0114956b5825418777cfab022275a0f45b6b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2563720cb5def93ec0e10be90f2c30c001644435", "tree": "bcada3810a70ebe7851a25b67d991af9d42f21fe", "parents": [ "6fee432f445c5c90ca9d69f5b332630ccfd233bf", "a95134ca6dda5f5e41562d55696918ab32ea07a1" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Nov 16 18:00:06 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 16 18:00:06 2023 +0000" }, "message": "Merge \"Extract the mapping of flags to APIs.\" into main" }, { "commit": "a95134ca6dda5f5e41562d55696918ab32ea07a1", "tree": "6c6826faa6181adcbc916972bd1326dc9e8eb068", "parents": [ "3fc4d3967e6f74ee11bafb1cde34b2ea4ba21d99" ], "author": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Wed Nov 15 00:26:25 2023 +0000" }, "committer": { "name": "Yiming Pan", "email": "yimingpan@google.com", "time": "Thu Nov 16 09:19:15 2023 +0000" }, "message": "Extract the mapping of flags to APIs.\n\nThis CL creates a binary that extracts flagged APIs from an API\nsignature file, and writes the mapping of flags to APIs to a pb file.\n\nBug: 311059624\nTest: mmm -j frameworks/base/api/coverage/tools/:extract-flagged-apis\n extract-flagged-apis \u003cinput api.text file\u003e \u003coutput pb file\u003e\nChange-Id: I9b6f45bd126cd6a5b2ed1e9f83bdaa12dd580480\n" }, { "commit": "3d70bb0a5de207a446f71db5687951a45e46a242", "tree": "8334c4a0f81d650219f8303de317da383f865ccb", "parents": [ "c988c576445819fc8d0efddf537744c68944ec41", "ed0743daac4104dcfbfd781a2d6b298b21e6d038" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Nov 15 11:43:29 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 15 11:43:29 2023 +0000" }, "message": "Merge \"Revert \"[CrashRecovery] Add module lib to Android SDK\"\" into main" }, { "commit": "ed0743daac4104dcfbfd781a2d6b298b21e6d038", "tree": "d90028ecad1341c49d297702035acdb8f94d7745", "parents": [ "9c3742afa1ed0923888b7f1ba69772373479f415" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Nov 15 07:39:58 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Wed Nov 15 08:27:25 2023 +0000" }, "message": "Revert \"[CrashRecovery] Add module lib to Android SDK\"\n\nRevert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943\n\nReason for revert: Leading to merge conflict\nBug: b/311082270\n\nReverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943\n\nChange-Id: Ic80afd7a8e09cf2e0cf6e453cbe004db0c9fcbd7\nMerged-In: I5c65d85d50b214926f5473908694070b4e896201\n" }, { "commit": "efec37bbedee73f05aeeaf6a3ea994982ddb77b6", "tree": "66dc2b9409fecc66622f5855f85d802e4864c96a", "parents": [ "f283fec0154cffc8644caafdaa1a2acb28e8eb56" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Nov 07 11:31:53 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Nov 14 12:13:13 2023 +0000" }, "message": "Remove appsearch entries in baseline\n\nThe issues have been fixed.\n\nBug: 303477132\nTest: m docs\nChange-Id: Ic1e5cf00f1973a554af81192aa52d6839c77859e\n" }, { "commit": "c0ae0d5a95cf1254d2652856722bfde392dcedf0", "tree": "4eb9fe0a1b9dd7bcd1fae7f18a378b9956546cec", "parents": [ "2c1ccb5a9c0ce14863fec5e83e0f516893bdd2c6" ], "author": { "name": "Elis Elliott", "email": "eliselliott@google.com", "time": "Fri Oct 20 15:12:23 2023 +0000" }, "committer": { "name": "Elis Elliott", "email": "eliselliott@google.com", "time": "Mon Nov 13 15:31:34 2023 +0000" }, "message": "Fix Doc links in device policy manager.\n\nFixes: 305195721\n\nTest: delete relevant lines in javadoc-lint-baseline then run m docs.\nChange-Id: I4be8b3720bf9e9373fa173750ae070718a4fc834\n" }, { "commit": "468a6f7f4b7fd32f09bb78b021fc9a23e411d6b1", "tree": "0d01606bdaf05ec1e95e9271cfae1e7ec80f3aef", "parents": [ "85be1d3879e26dc2217266ccdf145aeba487bf08" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Wed Nov 08 16:03:53 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Nov 08 16:04:00 2023 +0000" }, "message": "Revert \"Revert \"Added new framework-pdf jar inside MediaProvider...\"\n\nRevert submission 2775627-revert-2759049-framework-pdf-UAOVGTHHXO\n\nReason for revert: submit together with the fix to allow this new jar to coexist w/ mainline prebuilts\n\nReverted changes: /q/submissionid:2775627-revert-2759049-framework-pdf-UAOVGTHHXO\n\nChange-Id: Idf009cf17e142a04f4ca73396c6559c14504fc6a\n" }, { "commit": "864bce3c0d668e4c881d4aa4b5ce22af3c8a25fe", "tree": "c0d17223809e789533dbdace544ff3361b1ed5c9", "parents": [ "22daeee1fae2d38179af79299c54c85e86f8dbae", "f6dca2b9628b044f19a24dbeb1b4ec0ed5050929" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Nov 07 12:09:07 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 07 12:09:07 2023 +0000" }, "message": "Merge \"Share list of libs to depend on for APIs\" into main am: 92ba7fca73 am: 1bff7958b4 am: f6dca2b962\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2817545\n\nChange-Id: Ib259a5bda5c96e7c2a5e5c34654e1b4e1a9d2899\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "648b0db8cb1118c88b085e2844fc8ae92f163942", "tree": "3cad9af520128b08f570fdd4ed404031e436cc7c", "parents": [ "352e1eb9b49f38cac0b9deb5e82af65f8d3aca69" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 19:24:42 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Nov 06 19:26:39 2023 +0000" }, "message": "Share list of libs to depend on for APIs\n\nThe non-updatable part of the API has a few deps on module APIs. Extract\nthe list of libs to satisfy those deps into a variable so that it can be\nshared between the stubs_default and the java_library.\n\nTest: m\nChange-Id: Id416d294150131b477fc9c73a2d5811cfbf7012f\n" }, { "commit": "a3c89188ebb61011c20f9203fd18ed6ac85bb4fb", "tree": "8c64c7e0286b9b593780fa4a15e6807a1a943db9", "parents": [ "b8fe0e98bd5e4bea106ee4c9e35081dcef0af21d", "6f2dea9c3a3dc10cc6fe14a89df384da3db5ffc6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Nov 02 14:38:07 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Nov 02 14:38:07 2023 +0000" }, "message": "Merge \"Move some API rules out of top-level Android.bp\" into main" }, { "commit": "25c8ca63bf892dcf1c2d0f09a6d82091b91f1a22", "tree": "38fbec2f635f77a0f2e758ef0922e6ec4de12003", "parents": [ "57f63527391f64de9bcb2f7a4acbb9a29a59b07f" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 27 14:57:30 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Nov 02 14:15:01 2023 +0000" }, "message": "Stop disabling Metalava quality checks\n\nThese checks have been disabled since the initial integration of\nmetalava in the build system. Stop disabling them, but baseline existing\nissues.\n\nFor the checks that are disabled for good reason, leave a comment that\nexplains why.\n\nBug: 306806877\nTest: m checkapi\nChange-Id: Ica5c28f798b4aee0ae3722a0bd176bcc621d994e\n" }, { "commit": "6f2dea9c3a3dc10cc6fe14a89df384da3db5ffc6", "tree": "9651211718be976c14575ab77efc55b7bc64de6d", "parents": [ "14e7f959b5d9ce718c3a4c1b2d2b76ad9f448bd3" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:44:55 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:44:55 2023 +0000" }, "message": "Move some API rules out of top-level Android.bp\n\nThese defaults are used by api / stub modules, so move them into\nthe api subdir.\n\nTest: m\nMerged-In: I97661daa1c4c3cba6c31ccf1212334a41adaa271\nChange-Id: I97661daa1c4c3cba6c31ccf1212334a41adaa271\n" }, { "commit": "33f7f26e0a8555b9545dd2a2a8c427e93793c20c", "tree": "2b5897c6adcd717defbc33961192001183e33b57", "parents": [ "1822ab1745a9369d6866e5455a8abdc75b30ee27" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:42:12 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Nov 01 10:42:12 2023 +0000" }, "message": "Move some API rules out of top-level Android.bp\n\nThese defaults are used by api / stub modules, so move them into\nthe api subdir.\n\nTest: m\nChange-Id: I97661daa1c4c3cba6c31ccf1212334a41adaa271\n" }, { "commit": "ce66cb06f4f86f8c80384010b2bcb080b2ac0d64", "tree": "855f84aea52fdd83e9c75c08cacefbd8485de5f0", "parents": [ "8e5b534e0637ac88adc5afa1adc9ba75ee8513e1", "748fc971d2b4b7a0aa913249da9050e05f3a5cf5" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 31 14:35:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 31 14:35:36 2023 +0000" }, "message": "Merge \"Move aconfig-srcjars srcs into shared defaults\" into main am: 0a63944d29 am: 01aefbf28c am: 748fc971d2\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2809593\n\nChange-Id: Iff2849808951d1b2d205720a39ded212fad5d6e9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3816f26290f8c6cb4641a511a09fbf943f512088", "tree": "9b92d96e1f093244b6bab8d56fc5a146b715db62", "parents": [ "7b7f1fc96cb42ead592b5f48b5aadf3c06c04d3b" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Mon Oct 23 20:23:14 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Mon Oct 30 23:45:26 2023 +0000" }, "message": "Revert \"[CrashRecovery] Add module lib to Android SDK\"\n\nRevert submission 24444827-crashrecovery\n\nReason for revert: Since the module is not behind any flags, it is getting included in 24Q1 Beta release.\n\nReverted changes: /q/submissionid:24444827-crashrecovery\nBug: b/305826937\nChange-Id: I5c65d85d50b214926f5473908694070b4e896201\n" } ], "next": "dadbc58d52b0cb244f4d8cb99a79c118ab137798" }