)]}' { "log": [ { "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": "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" }, { "commit": "dadbc58d52b0cb244f4d8cb99a79c118ab137798", "tree": "b1a2645a6a3a7a381e5c621fa3ea19d4cf580de9", "parents": [ "c056440a34955acdaf059ca3ed4d605981781de6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 30 12:17:25 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 30 12:17:25 2023 +0000" }, "message": "Move aconfig-srcjars srcs into shared defaults\n\nThis ensures they\u0027re consistently added to all droidstubs modules\nfor the non-updatable part.\n\nTest: presubmit\nChange-Id: Ia17808572b3fa8d75cdc71e7981d562ad0036afc\n" }, { "commit": "98c4d9e94cdfff25c8b7cdd55fcf9d6d0ed8956a", "tree": "9c89d8bbc7ea5da44c735b8a3a1050bba46da645", "parents": [ "721379d1e850d793e1df261f967db053fe30ac52", "144b47b613924322de43ad8f23f7c12721b44b42" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Oct 26 14:35:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 26 14:35:21 2023 +0000" }, "message": "Merge \"Replace `--dex-api` with `signature-to-dex` instead\" into main am: 15181c7139 am: e43b4366a2 am: 144b47b613\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2805633\n\nChange-Id: Ifdadfbf54d9f36aa85d56e8d9198d6e7b38bf5fc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c4a9c3eebf99c47e77c2f8eaea487ec2745007a", "tree": "31a245aee3768a66407560ca8e474ee133b4c796", "parents": [ "04e59b174f08920d7b39982b8a4b13d2385928ea" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 26 11:18:56 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Thu Oct 26 12:59:21 2023 +0100" }, "message": "Replace `--dex-api` with `signature-to-dex` instead\n\nBug: 307737035\nTest: m combined-removed-dex\n # Check before and after to make sure there are no differences\nChange-Id: I51e774e6a340d310b96c0291b04f66b4737aebda\n" }, { "commit": "9bfafd7d56ec4dd42c2fffff49e6d546124e92ab", "tree": "a7d7a4f3741abb5b7082c3f6b2bdc35dd88d2392", "parents": [ "cebbc8901cf20b0e8d77c069b2c645ad65845de8", "5b2087445244a37587885415c95857c9b80a2ca5" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 25 13:15:01 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 25 13:15:01 2023 +0000" }, "message": "Merge \"Migrate droidstubs/droiddoc to flags\" into main am: 5e416bb876 am: 58b1862d74 am: 5b20874452\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796122\n\nChange-Id: I044bd7c41250af054f0e996389aca48da1a490b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5e416bb876f572cb3cbc5feaf3e4bd4e97d2c81d", "tree": "1b96f9f851cfb217af2bf45c18541c95ce0a1ee4", "parents": [ "55722bf523c4defd0ad0443441ce7e783060001d", "84a0e71aa349a4e53e7cf6083bc0cc728c6821ce" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 25 12:09:45 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 25 12:09:45 2023 +0000" }, "message": "Merge \"Migrate droidstubs/droiddoc to flags\" into main" }, { "commit": "b0a5dffa7c55c3066c0018bc51517b07098faf99", "tree": "6bc4aa79a085b3ca04852f291c3eae1f4624ce07", "parents": [ "a81ea29d7f8b9de919f6b1c3781f7798f13172fb", "3cc5e00e15481e2c3288a7a206e98b083852a528" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 24 12:43:36 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 12:43:36 2023 +0000" }, "message": "Merge \"Created empty framework-location non-updatable module\" into main" }, { "commit": "a81ea29d7f8b9de919f6b1c3781f7798f13172fb", "tree": "9f48bb844a8fd309fe25d011896462dc083687a6", "parents": [ "d3c5bea1e1ca19ccb0ce080b0334f3cf2f798344", "e35b1384812f82f2c7a75494c83b96c9b39e3c46" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 24 10:06:54 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Oct 24 10:06:54 2023 +0000" }, "message": "Merge \"SdkTestCore for non-updatable modules\" into main" }, { "commit": "3cc5e00e15481e2c3288a7a206e98b083852a528", "tree": "b94642762ee1605667d45b889788f8d66fcab503", "parents": [ "e35b1384812f82f2c7a75494c83b96c9b39e3c46" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Mon Aug 07 11:18:09 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 17:42:10 2023 +0000" }, "message": "Created empty framework-location non-updatable module\n\nNote that this is a re-cherry-pick of the original CL that is closer\nto the original CL than the first CP, to minimize the number of\nconflicts in Android.bp files.\n\nBug: 289776578\nTest: presubmit\nMerged-In: I721fc4ae5c62cf1eada9bb6b4e5b3f1a4c9db21a\nChange-Id: Ibf98f37cb795bc7f627a485546b6ce8ec23b3a9e\n" }, { "commit": "e35b1384812f82f2c7a75494c83b96c9b39e3c46", "tree": "e6672f036e13adf10d06c66a97b0fa80607abf23", "parents": [ "7d0b6b0e9da0d8fc60a43756ea6918fe7cbaeedb" ], "author": { "name": "Mark White", "email": "anothermark@google.com", "time": "Sat Aug 12 01:31:26 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 15:17:43 2023 +0000" }, "message": "SdkTestCore for non-updatable modules\n\nProvides SdkTestCore/test_core_current sdk_version for non-updatable\nmodules that have their test scope dependent on test apis from\nframework-minus-apex.\n\nIgnore-AOSP-First: Change in topic with internal-first projects\nBug: 289776578\nTest: m checkapi\n\nMerged-In: I855346c01bb609e81b14dbdc13330315badc339e\nChange-Id: I855346c01bb609e81b14dbdc13330315badc339e\n" }, { "commit": "84a0e71aa349a4e53e7cf6083bc0cc728c6821ce", "tree": "d2fd60e190ac6368febf1ccb7fb86b37576ea7da", "parents": [ "440f3cf26ac8d2df7948d2271c92037743bae5ad" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 09:17:45 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 10:55:47 2023 +0000" }, "message": "Migrate droidstubs/droiddoc to flags\n\nThe args attribute does not work well with defaults as it\u0027s just a\nstring, which cannot be extended. Migrate to the flags attribute.\n\nBug: 306806877\nTest: diff ninja file before/after\nChange-Id: Ifd1d503d2da29bf1cdf2664201f9c8276f9480a4\n" }, { "commit": "440f3cf26ac8d2df7948d2271c92037743bae5ad", "tree": "66332302588d725791f8bdea8ba65baad6ef94b5", "parents": [ "7d0b6b0e9da0d8fc60a43756ea6918fe7cbaeedb" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Sep 20 10:03:31 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 23 10:54:49 2023 +0000" }, "message": "FlaggedApi: enable enforcement for all non-updatable APIs\n\n(cherry pick of 7da1d25541124cf0c6ced6eb0af738fb9263b77a\n and 38dd161e4f88b43e7d251f8888714d79c2557b7f)\n\nBug: 297362755\nTest: make checkapi\nMerged-In: If7333ead86d9028ab0a1cc8f25fc534cb13a1858\nMerged-In: I4d384efac8a8d3b183d9b207b195ad5489db9e55\nChange-Id: I4d384efac8a8d3b183d9b207b195ad5489db9e55\n" }, { "commit": "b18f6997b44af5b2513a55366fc158cf58d2347a", "tree": "de2a5fc921e35e1fb5f0f54c2dcc133601bcdd9d", "parents": [ "5ec66d42ea56cd2c025a92d979e5f5dc118fc084", "c7e801996e107a2446fac2f6a9cc5ab4f9338e02" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 20 17:34:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 20 17:34:38 2023 +0000" }, "message": "Merge \"Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current\" into main am: f8ced8b7c5 am: fdb527b1b4 am: c7e801996e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2795272\n\nChange-Id: I672114d6d1c6f5e67427fb645691926508ee34bc\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ec66d42ea56cd2c025a92d979e5f5dc118fc084", "tree": "21bcf54771591416e85855bf999f0409a3a9a76c", "parents": [ "51362e4b2ab4fa232f562b46bbd3cc1b934d7d80", "01c0e4e821bff71bcca56cac883f899fc4a9357f" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 17:32:17 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 20 17:32:17 2023 +0000" }, "message": "Merge \"Explain the -hide params passed to doclava\" into main am: a8b4f6f7af am: c457428cf9 am: 01c0e4e821\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796300\n\nChange-Id: I5664c09354308e781bf6a37c0c8b763f48144b7c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f8ced8b7c50385c330224d28ba5be81a558b67f6", "tree": "94420a3401632e49c4b30b073da296d981a6225b", "parents": [ "a8b4f6f7afb3c6b3f2337b86dee94adc083573df", "beeb35a8d65c14c592d3ba19114372ae3cd1e50f" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 20 16:40:40 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 20 16:40:40 2023 +0000" }, "message": "Merge \"Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current\" into main" }, { "commit": "a8b4f6f7afb3c6b3f2337b86dee94adc083573df", "tree": "5f4a9fca25035faa2e975ac8a6b1b190e2c56dec", "parents": [ "1b18e3d1da3c212734c85439a97ca30f4ed22362", "82eef15abe01b4c1078e453ee448789486ee0235" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 16:28:10 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 20 16:28:10 2023 +0000" }, "message": "Merge \"Explain the -hide params passed to doclava\" into main" }, { "commit": "82eef15abe01b4c1078e453ee448789486ee0235", "tree": "b5bf64b6dd261714257145a714352ef451cd50f7", "parents": [ "016f05cb067643a1b239123b995944dca1d40515" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 13:06:43 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 20 13:17:02 2023 +0000" }, "message": "Explain the -hide params passed to doclava\n\nThe reason certain checks are disabled in doclava is that they have been\nimplemented in metalava instead. Clarify that.\n\nTest: presubmit\nChange-Id: I32c32783dea59a63d95d14b4ad636159536c2944\n" }, { "commit": "4b2f12ca3e0433d24c776ce99730cc28ef6ade35", "tree": "c70a2d9e2830409d7433277a416af68df23c2f2f", "parents": [ "6a63d356f561f05f0df388f3aed487c4bbeb8f37", "9c3742afa1ed0923888b7f1ba69772373479f415" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Oct 18 17:01:24 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Oct 18 17:01:24 2023 +0000" }, "message": "Merge \"[CrashRecovery] Add module lib to Android SDK\" into main" }, { "commit": "beeb35a8d65c14c592d3ba19114372ae3cd1e50f", "tree": "f76a75c17f885ad8457c9296cbf27c0510cb395e", "parents": [ "358637313b09d4658b9a0a4b04e3d2f86fed08ba" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Oct 17 22:22:24 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Tue Oct 17 22:22:24 2023 +0000" }, "message": "Fix discrepancy between from text vs source android_test_frameworks_core_stubs_current\n\nJust like all other android_*_stubs_current modules,\nandroid_test_frameworks_core_stubs_current is added to classpath of the\njavac compilation of its reverse dependencies, and its static libs is\ndynamically switched between the \".from-source\" suffixed from-source\nstub compiling java_library module and the \".from-text\" suffixed\nfrom-text stub compiling java_api_library module.\n\nOther than the origin of the stubs, the two modules are expected to\ncontain (mostly) identical APIs. However, the two static libs of\nandroid_test_frameworks_core_stubs_current currently do not follow this\nprinciple as the from-source java_library module does not add the\n\"private-stub-annotation-jar\" as static lib, while the from-text\njava_api_library does. This discrepancy lead to compilation error of the\nreverse dependencies when defaulting build to from-text stub generation.\n\nThis change fixes the discrepancy between the two modules by removing\n\"private-stub-annotation-jar\" from the static lib of the from-source\nmodule and making the two modules behave more similarly.\n\nTest: patch on internal main and run `m framework-location.stubs.test.from-source --build-from-text-stub`\nBug: 301522358\nChange-Id: I821b7bb25a8f7ec7f9977a01ebdfbd5f1b25cf5e\n" }, { "commit": "819e99bd4a4fa70c812dc4afd50a450cc7b5e8c1", "tree": "fb8d4a95763ef910a32b605c9cf6bd56e1dc30f4", "parents": [ "645ed0e34c570c80c20fa35243096a66e15bfce3" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 17 15:08:24 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 17 15:08:24 2023 +0000" }, "message": "Cleanup baseline file\n\nAdd bug links for the remaining issues, and write a comment about the\nproblematic @ChangeId docs.\n\nBug: 303184203\nTest: presubmit\nChange-Id: I2f301a6e1d8250745d179ee9a0326e6174d1da2d\n" }, { "commit": "55f1240959c3ea99292e570f42dd53675736be80", "tree": "afff3857267b0b214b1c6c5a3b518989e9cd3162", "parents": [ "85a21cbcd9da901c652d282e179149c50b0ca02d", "40952cf45cbfbdf4b463eb1c851e8531c14d44e6" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Oct 17 10:32:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Oct 17 10:32:38 2023 +0000" }, "message": "Merge \"Use lint database from api_version_system\" into main am: 016f05cb06 am: f9b3e042ad am: 40952cf45c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2789473\n\nChange-Id: I02d3cb6fdb9571c26b5ac4a31571b2af423411e6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dd97b7840562cb31d350fa98429769cb4a939031", "tree": "39787e59cca6dc4ba7bcc4b0eb9c8c76043377ad", "parents": [ "52cc77c3163c853bddaffc3f34fdf286369e617b" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 18:37:12 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 22:26:05 2023 +0100" }, "message": "Use lint database from api_version_system\n\nDroidstubs now support using the api-versions.xml from another\ndroidstubs module, so reuse the one from `api_versions_system`\nin `framework-doc-system-stubs`.\n\nTest: m framework-docs-system-stubs\n # Diff stubs before and after\nChange-Id: I0aa3a74664e2a9343e90d91b7520ce8bbcadfac5\n" }, { "commit": "7de813b23f3c4d334425185acb334067f1133aeb", "tree": "ea8c83d63e020479e4b9b85ea172a3c44f278316", "parents": [ "1c391eac48310ef95f2d96fb05f71e21fd831401", "ed89e9030d159658b14c2ab3923a390cce43f44a" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Oct 16 18:44:38 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 18:44:38 2023 +0000" }, "message": "Merge \"Disable validations for full api surface stub java_api_library\" into main am: 52cc77c316 am: a8a00dc812 am: 977eb9d309 am: ea24a657ad am: ed89e9030d\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776687\n\nChange-Id: I0185fdc64b05774e29b29a403f51b237a3688b2e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6e676243e044d1fba859f24ea5b193e74a411db0", "tree": "3e9a3a015f36227e33ec2e981a801346bbcfc35a", "parents": [ "0e06e1428be752ff5f4c3dffec01bd880e77524b", "25160d2491dbfe674ae8fd03616a1309ef4655bc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Oct 16 17:54:09 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Oct 16 17:54:09 2023 +0000" }, "message": "Merge \"Remove unused `extensions_info_file` property from framework-doc-stubs\" into main am: b91b319c5f am: e0b2dfe25a am: 3a9e52819e am: e6651a9a5c am: 25160d2491\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2786218\n\nChange-Id: If3715ffb1e812f58a91d9aac73640853a2ade39f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9c3742afa1ed0923888b7f1ba69772373479f415", "tree": "de237ab547fcb5a3d481a1e38802e5229d3380b7", "parents": [ "7e44fa6c44cace0006511dea23de7e63e711ba06" ], "author": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Tue Aug 15 14:13:23 2023 +0000" }, "committer": { "name": "Harshit Mahajan", "email": "harshitmahajan@google.com", "time": "Mon Oct 16 17:03:45 2023 +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\nTest: m\n\nChange-Id: Ica9b0bddc2f9cb6621a01dcd3859c39357144b5f\n" }, { "commit": "52cc77c3163c853bddaffc3f34fdf286369e617b", "tree": "eb20cd2d1952ad7ccd351dab9e5d776b37a9b97e", "parents": [ "28dc9370caa27e93852655ff53cf41d92172b4e3", "d67ac471d6317de6dd07f3b17051107f56a6d028" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Mon Oct 16 16:34:41 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Oct 16 16:34:41 2023 +0000" }, "message": "Merge \"Disable validations for full api surface stub java_api_library\" into main" }, { "commit": "3cfb89b10ea5e09f85e7719ed57d76b77408ea01", "tree": "106a8797e6d921c5bc4fbefbf22ba139f967a6c7", "parents": [ "05909bca25a924536a9c9a5f51dce61fac90d591" ], "author": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 13:46:17 2023 +0100" }, "committer": { "name": "Paul Duffin", "email": "paulduffin@google.com", "time": "Mon Oct 16 13:46:17 2023 +0100" }, "message": "Remove unused `extensions_info_file` property from framework-doc-stubs\n\nThe `droidstubs.extensions_info_file` property is only used when\n`api_levels_annotations_enabled: true`. The `framwork-doc-stubs` uses\n`api_levels_module` instead and so does not need `extensions_info_file`\nany more.\n\nBug: 305688818\nTest: m framework-doc-stubs\n # Before and after and check output to confirm that it does not change\nChange-Id: I4ad3f5b24e998eb9d5d47fa2240d2281fa9d6fc6\n" }, { "commit": "2ccbeb75aa89a7ff598230ad08c27a10c8c774de", "tree": "9f9ddf23e427822b3641a2f991ce57f4946b0049", "parents": [ "56844fad9e73cae85c355db08efb3d2a6f249f61" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 13:16:35 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 18:32:05 2023 +0000" }, "message": "Fix broken framework documentation\n\nVarious issues here, but the most recurring one is referencing SystemApi\nfrom public javadoc. Remove or rewrite such references.\n\nAlso common is trying to @link IntDefs. Usually this is not necessary,\nas the presence of IntDef in the @param/@return auto-generates relevant\ndocumentation.\n\nBug: 303184203\nTest: m docs\nChange-Id: Ie59e61881c45c73fbbe08250493bd35eca268ef6\n" }, { "commit": "56844fad9e73cae85c355db08efb3d2a6f249f61", "tree": "0946c5103601ae2578ef0f8042e92e9051e72f3b", "parents": [ "e1c8ab837912ccecdce5851d9ad1161fb6041e71", "45717db8c57dd9c4538aec8af522139f003b8da9" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 14:38:37 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 13 14:38:37 2023 +0000" }, "message": "Merge \"Fix broken documentation in android.view\" into main" }, { "commit": "45717db8c57dd9c4538aec8af522139f003b8da9", "tree": "ed2b12427df8bed6cd321b1a8333f00a352b8509", "parents": [ "352e82e423485f0e94fee11bcace3881a5fd7117" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 10 14:11:04 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 12:09:36 2023 +0000" }, "message": "Fix broken documentation in android.view\n\nThe most common problem were references to SystemApi or @hide symbols\nfrom public documentation. Replace such references with natural english\nor {@code}. A few references were just incorrect before and have been\nfixed.\n\nBug: 303184203\nTest: m docs\nChange-Id: I243e27d7ae6e0dafa2af4f3cc44aa7e8894025f1\n" }, { "commit": "caa22c22de80320c5c2247a63f567cc2c45bdbb3", "tree": "159cf6ae8119fc79cfd82fea50d3aff5ae5eff73", "parents": [ "a3de0c1eaed23b6ecac48b1bfba4d6589154a028", "afca5e6a4419c4758e6f28a13162e793b155be74" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 12:04:50 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 13 12:04:50 2023 +0000" }, "message": "Merge \"Fix some broken docs in android.media\" into main" }, { "commit": "d67ac471d6317de6dd07f3b17051107f56a6d028", "tree": "4aa80a0fddd3f150ba9d09a1bb3de37a048d16bf", "parents": [ "0ac140858e514a63ea6e1c95e7efde29e0855d98" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 05 21:18:23 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Fri Oct 13 10:39:16 2023 +0000" }, "message": "Disable validations for full api surface stub java_api_library\n\njava_api_library modules run validation to check the sanity of the API\ntext files by default when generating the stubs from txt files. However,\nthis leads to circular dependency issue when the validations are added\nto the full api surface stub java_api_library modules as droidstubs may\nset sdk_version property. Therefore, disable the validation for full api\nsurface java_api_library (e.g. android_*_stubs_current) modules.\n\nTest: m nothing --build-from-text-stub\nBug: 288624417\nChange-Id: Ib1b7b804736ef4e4cd2ea979aabea211af1927af\n" }, { "commit": "352e82e423485f0e94fee11bcace3881a5fd7117", "tree": "12bc5703c71868f224b558015d718d04203f1641", "parents": [ "95046d067e5bc1d255ecaa6afa8a2fad4cc599cb", "1dc3ac9b80298d53df909ae781a61bea6b51c8ac" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 08:22:58 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 13 08:22:58 2023 +0000" }, "message": "Merge \"Fix broken docs in companion\" into main" }, { "commit": "95046d067e5bc1d255ecaa6afa8a2fad4cc599cb", "tree": "50980f26a09d808682631ef4f7d50f463731aba5", "parents": [ "d4882b762ae3144a33bb5e8beec5bcc620c4f390", "a95ad7550d00dd1d63bab5b70dd31a1dbf297eab" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 13 08:06:35 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 13 08:06:35 2023 +0000" }, "message": "Merge \"Fix broken documentation in android.credentials\" into main" }, { "commit": "1dc3ac9b80298d53df909ae781a61bea6b51c8ac", "tree": "2d62598750a1d601ca25ff9cd0a174694e82a903", "parents": [ "ef18eed370f71a21ce4ba0b97bbc4c899ea1d579" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 13:17:27 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 22:00:44 2023 +0000" }, "message": "Fix broken docs in companion\n\n- Remove @links to SystemApi\n- Escape @-symbols\n\nBug: 303184203\nTest: m docs\nChange-Id: Iafaaa2150d36cf36dadfefaa29f56e0dd0d756d9\n" }, { "commit": "0e16bedf29023c951166311a23f5d29adc9c8a62", "tree": "74236037bb2ba42047e9cb3c241977cba7880f74", "parents": [ "609358b9cb8673079d5b41ad55f3e7941d4b956b", "4bab811916f7d3217e07ff8a223bba3ad10778e4" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 19:34:49 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Oct 12 19:34:49 2023 +0000" }, "message": "Merge \"Add module lib and test union java_api_library module\" into main am: d135292fb3 am: 1385c1701d am: fc238577f0 am: 43b3f4df87 am: 4bab811916\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775453\n\nChange-Id: I505d7b260e4c378a8f8c557fafd2f49c537248ea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d135292fb3cc0a531decd9b3b2c0f00f31e35772", "tree": "48f0bee57759618f62377004db2638c0548c47cc", "parents": [ "47c10d04d415ac85f0babe11a2079a991a63f1e8", "4683b14cf5fe2bf25eb8428f10a1b163d238bdf1" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 12 17:33:35 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 12 17:33:35 2023 +0000" }, "message": "Merge \"Add module lib and test union java_api_library module\" into main" }, { "commit": "afca5e6a4419c4758e6f28a13162e793b155be74", "tree": "8f20f73ee3d45d2a0a868ed87cfd2d1e63285246", "parents": [ "1c120361828a41db9300e5d5ec7cef2b1506beb5" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 15:36:46 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 17:27:22 2023 +0000" }, "message": "Fix some broken docs in android.media\n\n- getInstance is SystemApi, so cannot be linked from public javadoc\n- MidiDeviceService is not a member\n- The documentation generation for @ChangeId constants is special\n and cannot resolve imports, so fully qualify all links there.\n\nBug: 303184203\nTest: m docs\nChange-Id: I5838dd3057e25d5c50f4b912d46c9805bb0378cf\n" }, { "commit": "a95ad7550d00dd1d63bab5b70dd31a1dbf297eab", "tree": "e91f755b26066d90086efba4647de714c65c49b2", "parents": [ "1c120361828a41db9300e5d5ec7cef2b1506beb5" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 14:06:50 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 14:12:41 2023 +0000" }, "message": "Fix broken documentation in android.credentials\n\nBug: 303184203\nTest: m docs\nChange-Id: I745ea2f582640ea10a81b6d0369bede3f243686c\n" }, { "commit": "0aa032ee86a06292908033224d778f86b7421530", "tree": "f88171bb9b5c47093920f84f4c1a6a80c58fb711", "parents": [ "c18f392bd5f202f3243e3d28648de46e423df9cd", "1d5e43b41c90b7bc059c5fbb5ea343f94dddd09e" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 12 13:40:55 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 12 13:40:55 2023 +0000" }, "message": "Merge \"Fix some broken docs in android.content\" into main" }, { "commit": "20339da1cf4c2f28aab81a85e8ca8ac9be553266", "tree": "24d9bacf8242ce74c90a79dd5e3e4934377f3e11", "parents": [ "0775c84d41694d9b194605be62f6845ff4386739", "961767c37132b0307265c1579403d5cc5b57f4c7" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 23:46:56 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 23:46:56 2023 +0000" }, "message": "Merge \"Cleanup obsolete doc build targets\" into main am: a445bfed96 am: b058ee568f am: e048e78282 am: e634f38ad4 am: 961767c371\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2781371\n\nChange-Id: Ifaa5f11a3fca0491dc027d918d491bc0e84c9429\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "17e5d8e7474dace3ede98c636fe5993dea522ec1", "tree": "996cf76d8d1eadafc115346ddfc0ca83bb404c82", "parents": [ "192be555a637618bb8ccaf2c1f31311555c066ff", "72ccd201e5c401f5588dc616b8b58ec95da24d23" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 23:43:44 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 11 23:43:44 2023 +0000" }, "message": "Merge \"Remove framework-doc-only-libs\" into main am: 13fc49aebf am: d9105800d8 am: e017d0cf3b am: c200d79854 am: 72ccd201e5\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2780989\n\nChange-Id: I1101e61dbb2312e2e409bd9edeb9ac9101f6fa1a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1d5e43b41c90b7bc059c5fbb5ea343f94dddd09e", "tree": "0cf2bcb6acb7e7abb0b32a49ef6a5684eae71fe7", "parents": [ "f192af2ad2fc78bb71dd09276a54d40fad798964" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 17:56:46 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 19:35:37 2023 +0000" }, "message": "Fix some broken docs in android.content\n\nBug: 303184203\nTest: m docs\nChange-Id: I50cd982923c160452de2ee2ee7a982dab0f78a5c\n" }, { "commit": "4683b14cf5fe2bf25eb8428f10a1b163d238bdf1", "tree": "8d676c86012e8332d226ae32b3cef5ad09fd3dd0", "parents": [ "9a7e0d45103e955edeab791ee55a05100e1dc139" ], "author": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Thu Oct 05 23:42:51 2023 +0000" }, "committer": { "name": "Jihoon Kang", "email": "jihoonkang@google.com", "time": "Wed Oct 11 16:59:41 2023 +0000" }, "message": "Add module lib and test union java_api_library module\n\nCurrently, hiddenapi_modular defines test api surface as a subset of\nmodule lib api surface, causing hiddenapi check failure in from-text\nstub build. In order to mitigate this and enable the hiddenapi check in\nfrom-text stub build, this change introduces a java_api_library module\nthat generates the stub jar that contains both test and module lib\napi contributions. The module will not be available for consumption, but\nwill only be used in hiddenapi check.\n\nTest: m android_test_module_lib_stubs_current.from-text --build-from-text-stub\nBug: 191644675\nChange-Id: I2b6c9f75d9ebcfd75fa5b509dbef14aa0f88ac97\n" }, { "commit": "2e6a904ac6f5e4511a5c9430822919d3b35eab78", "tree": "124b2ddde2ed6ca460f3d3356e2b39d784efd6b6", "parents": [ "ba8f3c25cf91a632cbb955b9ddb1bd90c9710ccc" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 13:56:42 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 16:17:25 2023 +0000" }, "message": "Cleanup obsolete doc build targets\n\n- the *-check-docs target doesn\u0027t do anything the other targets don\u0027t\n- online-* are, I think, the old d.a.c targets but the ds-* targets are\n what\u0027s currently used\n- the hidden-* target isn\u0027t meaningfully different from others, either\n\nTest: presubmit\nChange-Id: Icab977d40917aa14c629629965c6126e20f4f3ee\n" }, { "commit": "ba8f3c25cf91a632cbb955b9ddb1bd90c9710ccc", "tree": "b4ab5c22ce3dd1763fd881c9f2cb69bb0c4196f8", "parents": [ "65370ed5ceb03ac853930d5e285bb6e24f204027" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Tue Oct 10 18:52:20 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 15:42:42 2023 +0000" }, "message": "Remove framework-doc-only-libs\n\nThey don\u0027t seem to do anything. All the docs compile without them\nand I don\u0027t see any additional warnings/errors being printed.\n\nIf they actually do something, the list is almost certainly incomplete\nanyway.\n\nTest: m docs\nChange-Id: I1bda7c4cc1d882d80cfe38ee734643c9eed030dc\n" }, { "commit": "65370ed5ceb03ac853930d5e285bb6e24f204027", "tree": "639a249617797f618b304d176f8a5695e8d49dd7", "parents": [ "34eb50956bc0d9b84228d7a85879b8194bb82013" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 13:46:34 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 11 15:42:11 2023 +0000" }, "message": "Don\u0027t link the framework impl in docs build\n\nThis gives the docs build access to hidden symbols, which hides issues\nin the documentation.\n\nBaseline the newly discovered issues.\n\nBug: 217734059\nTest: m docs\nMerged-In: I357f5a341a170a37152d836861a330039a83886c\nChange-Id: I357f5a341a170a37152d836861a330039a83886c\n" }, { "commit": "2a0f9e1103520cd4df2316e5fc8164ef8d671e9e", "tree": "382461254ce307cd80cc4d1e6d966e0ca5b7a910", "parents": [ "688d6c0108008a7c351bec09f61422acc214b7f3", "560bd160f5dec9cd37ce484454c5c69801f09a06" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 09 22:06:43 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 09 22:06:43 2023 +0000" }, "message": "Merge \"Add a few additional baseline entries\" into main" }, { "commit": "042df8f083c3e6e6feec057ac52dc78d4ad3e46b", "tree": "8c401b7173bbeb240c27b601417c3fadcfe06193", "parents": [ "f547072a633525642f8364f647ae38dd2b5b42e1", "84d6d75d74aa28805e09f853e9291ddfc19823e9" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 09 18:36:52 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 09 18:36:52 2023 +0000" }, "message": "Merge \"Fix broken documentation in telephony and telecomm\" into main" }, { "commit": "560bd160f5dec9cd37ce484454c5c69801f09a06", "tree": "389f38da9511c49df399d1c89746779b77794e28", "parents": [ "84d6d75d74aa28805e09f853e9291ddfc19823e9" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 09 15:15:43 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 09 15:41:31 2023 +0000" }, "message": "Add a few additional baseline entries\n\nPreviously the tool applied baseline entries to the whole file that\nhad an entry. The tool is being changed to take the message into account\nwhen applying baseline entries. Add a few additional entries to make\nthe build pass with that change in effect.\n\nBug: 217734059\nTest: m docs\nChange-Id: I59fcc620b0e35f9cd64a9f83f6e66824751d2837\n" }, { "commit": "c41764f9cc2c0f6c1a0ba5c54360821bbfe0e1d2", "tree": "de87a160f559cd108a852b9992d46e0830b14ec1", "parents": [ "48cf465ec38d684385e4516119cc8fc9d66defc8", "9ae30915138108cf337a85ecf39d6f30d005d384" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Mon Oct 09 09:02:12 2023 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 09 09:02:12 2023 +0000" }, "message": "Merge \"Fix broken @link references in CompatModePackages\" into main" }, { "commit": "85a8b7c3e596b78cc2dec8bdf0bec2596aafbd12", "tree": "89ff8672b90057053ebd25d6623b4ae9b1a27989", "parents": [ "03adaefd582b0637a872e56c018c867b579c49f8", "ddb0d9cccd56aa279ce7ef99eff7066e253bcea8" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Sat Oct 07 00:47:33 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Oct 07 00:47:33 2023 +0000" }, "message": "Merge \"Revert \"Added new framework-pdf jar inside MediaProvider module\"\" into main am: 62023142cb am: 57e41bd97e am: 2576a48af6 am: f5d4227422 am: ddb0d9cccd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2775630\n\nChange-Id: I2bda12ada35e977e796f399796556226f79cec9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9ae30915138108cf337a85ecf39d6f30d005d384", "tree": "9eb0e360c3654b23022352ba16a8fbc1ad706aef", "parents": [ "a1dc124d3de40fc71a9c8073d2bd937a3dd9d1dd" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 06 15:13:55 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Fri Oct 06 15:22:44 2023 +0000" }, "message": "Fix broken @link references in CompatModePackages\n\nThe javadoc for @ChangeId constants are generated differently to normal\ndocs into a compatchanges.html page. This page is kind of compiled\nstand-alone, so can only resolve references to the public SDK.\nCompatModePackages itself is not in the SDK, so the @link references\nin this class fail to resolve.\n\nFix this by using manually defined links (\u003ca\u003e) instead. Note that\ndoclava generates headers with the id of the compat constant that we can\nuse for the href of our \u003ca\u003e tags.\n\nBug: 303570856\nBug: 303184203\nTest: m offline-sdk-docs ; inspect compatchanges.html\nChange-Id: I5785098554f65b377c8f862b6e3a50225703f742\n" }, { "commit": "62023142cbc0dd3c0f7556731b762fcc23ee3965", "tree": "dda62932fba31bb4ec97af15f49c1c3e2bc5ec55", "parents": [ "031de969c6f94d746ec3a01585956e46e4ff3e25", "85be1d3879e26dc2217266ccdf145aeba487bf08" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Fri Oct 06 10:56:28 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Oct 06 10:56:28 2023 +0000" }, "message": "Merge \"Revert \"Added new framework-pdf jar inside MediaProvider module\"\" into main" }, { "commit": "85be1d3879e26dc2217266ccdf145aeba487bf08", "tree": "8b491130b1535317c88e6b3820939f4a96263348", "parents": [ "962d4138957e6c0dbc05972ed14279b210f877df" ], "author": { "name": "Alyssa Ketpreechasawat", "email": "kalyssa@google.com", "time": "Thu Oct 05 16:09:16 2023 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Oct 05 16:09:39 2023 +0000" }, "message": "Revert \"Added new framework-pdf jar inside MediaProvider module\"\n\nRevert submission 2759049-framework-pdf\n\nReason for revert: it blocks us from enabling prebuilts in next target in main (go/stale-mainline-prebuilts for more info)\n\nReverted changes: /q/submissionid:2759049-framework-pdf\n\nChange-Id: I53b3216ec43471789a6c23c6b620c8a153953cc9\n" }, { "commit": "84d6d75d74aa28805e09f853e9291ddfc19823e9", "tree": "570929a7bcbc2c670d176c71a67320833e3c1357", "parents": [ "7e491b253f759466cb9edfc0d889bed13e81de5a" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 05 09:46:37 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 05 13:02:05 2023 +0000" }, "message": "Fix broken documentation in telephony and telecomm\n\nDue to a bug in the build system, broken @see/@link references have not\nfailed to build for a while, so many errors have accumulated.\n\nThis is an attempt to patch up the telephony and telecomm docs. The\nmost common errors and fixes were:\n- @link-ing IntDef constants from javadoc. IntDefs are not present\n in the docs, so rewrite those to natural english, or point to the\n constant prefixes\n- Javadoc for public symbols referencing SystemApi symbols. Change those\n to @code instead of @link\n\nThere were various other fixes too, and I\u0027m not sure they\u0027re all\nperfect, but certainly an improvement over the brokenness we have\ncurrently.\n\nBug: 303184203\nTest: m docs\nChange-Id: I5cefc72074ced29c0b046cf59deb7ee371e74bf0\n" }, { "commit": "7e491b253f759466cb9edfc0d889bed13e81de5a", "tree": "f9dceb7da1fa4b4d464b6ef6ce4fb62e25abca01", "parents": [ "b88840e2aa50434d06a24e84ebcf28a7a83649f6" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 05 07:45:45 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Thu Oct 05 07:45:45 2023 +0000" }, "message": "Don\u0027t link the framework impl in docs build\n\nThis gives the docs build access to hidden symbols, which hides issues\nin the documentation.\n\nBaseline the newly discovered issues.\n\nBug: 217734059\nTest: m docs\nChange-Id: I357f5a341a170a37152d836861a330039a83886c\n" }, { "commit": "f193009dfb34ab275865c940e5356395d853c8b5", "tree": "efe1e71ba2066a519f06c36f5fb56af29d50f393", "parents": [ "07cb42853f73b8096f682dcf8d845bcda87934ab" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 18:31:24 2023 +0000" }, "committer": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 18:42:34 2023 +0000" }, "message": "Add baseline for existing docs failures\n\nThis is a list of allowed issues. The intention is to trim down this\nlist now that adding new issues is disallowed by the build.\n\nBug: 217734059\nTest: m docs\nChange-Id: I92b45730c175566fdb1e9632016fc96c1d9db412\n" }, { "commit": "07cb42853f73b8096f682dcf8d845bcda87934ab", "tree": "e5fadeef62073890d36e7c5f56c961d5ce357c02", "parents": [ "1a76c8e2f74fd9c8efb05a7f56f20c7626cfdc45", "e6a15d30163ca332eaa1131234b9bb902b2c8097" ], "author": { "name": "Anton Hansson", "email": "hansson@google.com", "time": "Wed Oct 04 18:33:50 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 18:33:50 2023 +0000" }, "message": "Merge \"Specify lint-baseline for docs builds\" into main am: 209ae2e5d2 am: 405169e822 am: a0316c8503 am: 5cd836f221 am: e6a15d3016\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2769722\n\nChange-Id: I728c6e35eef4f382a3555eda34a50e2b99b22748\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1a76c8e2f74fd9c8efb05a7f56f20c7626cfdc45", "tree": "7b81f7b4cc16d7400bb8e7336d065da83b1a3ee7", "parents": [ "933467e2a8cd4be3b0511ea3408108206157da49", "f74082007b10ade24e52da79c87221e2b2b43d00" ], "author": { "name": "Christopher Parsons", "email": "cparsons@google.com", "time": "Wed Oct 04 18:32:36 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Oct 04 18:32:36 2023 +0000" }, "message": "Merge \"assign labels to merged_txt modules with defs\" into main am: 61bf3646a4 am: 4b20a9f47e am: 0fafd7d0ee am: 9474dcedc8 am: f74082007b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2765313\n\nChange-Id: I36de5b471f388c0f6365158bc95633f3bebae608\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" } ], "next": "405169e822afdf5b9e617f10fae848875e7df45f" }