)]}' { "log": [ { "commit": "45168a88ae2a7e1abafe1cc81001d97ff00194e2", "tree": "d4d8c1e163fd1f6a10c406202c239e08565ef246", "parents": [ "b1404a41ca7972d23690cb05ab23e7e6bc40de6b" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Tue Feb 11 20:14:35 2025 -0500" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Tue Mar 11 11:38:56 2025 -0700" }, "message": "Remove long-deprecated assertEquals uses\n\nThese have been removed in Python 3.12:\nhttps://docs.python.org/3/whatsnew/3.12.html#id3\n\nBug: 388344853\nFixes: 402292455\nTest: atest fhir-spec-extractor-test -- --abi x86_64\nFlag: TEST_ONLY\nChange-Id: Ib0b4445e491ca4083114a2c8b60d0b42e7726870\nMerged-In: Ib0b4445e491ca4083114a2c8b60d0b42e7726870\n" }, { "commit": "b1404a41ca7972d23690cb05ab23e7e6bc40de6b", "tree": "65c315536be1c472dfadc1c92d68550129b4074e", "parents": [ "3b20d40859100d87c58bb0b3e26d381cbc52e4f5", "1a0c6365064a9fdd0d453150ea36b7d1c7fd2b1a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:58 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Mar 08 16:09:58 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to AOSP main\n\nBug: 385190204\nMerged-In: I89dac6ea5aebc01f59e7f5f5576ea397dbc92316\nChange-Id: Id2159b13689c700671cf5ef27a222e980a09b44b\n" }, { "commit": "1a0c6365064a9fdd0d453150ea36b7d1c7fd2b1a", "tree": "65c315536be1c472dfadc1c92d68550129b4074e", "parents": [ "049a5768cc63699861dbe4a20d488cc7ead2adc1", "99359dc599434b1f00118ab1b701b12afc75cb30" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 06 12:22:42 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Mar 06 12:22:42 2025 -0800" }, "message": "Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future\n\nBug: 385190204\nMerged-In: Ic08f46624d2728b85d35fa3b0433c9f716c1c00e\nChange-Id: I7c08ac1afcbd56dc7f47588963eefbc797257d7a\n" }, { "commit": "049a5768cc63699861dbe4a20d488cc7ead2adc1", "tree": "49f13b29b40a8428794f87f923aa98abd35a2884", "parents": [ "91713ae03ae7d025d47d6f00dd5aee7337053f82", "ac4440238d9f14018578ba6b66b4308c2997a823" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Feb 27 15:18:59 2025 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 27 15:18:59 2025 -0800" }, "message": "Merge \"Merge 25Q1 (ab/12770256) to aosp-main-future\" into aosp-main-future" }, { "commit": "91713ae03ae7d025d47d6f00dd5aee7337053f82", "tree": "c0cc15d44622ac47c643315b8e72cfc5b506e0db", "parents": [ "437fb777d2e3649f918227d7e22f082e76b26f6e", "3b20d40859100d87c58bb0b3e26d381cbc52e4f5" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Thu Feb 27 09:23:39 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 27 09:23:39 2025 -0800" }, "message": "Fix type use nullability in AppSourcesAdapter am: 3b20d40859\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3508011\n\nChange-Id: I80f2e322a28978d45fd3dc416a2c96a01eb8376b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3b20d40859100d87c58bb0b3e26d381cbc52e4f5", "tree": "c0cc15d44622ac47c643315b8e72cfc5b506e0db", "parents": [ "bee5753cef5630200d0ae4fd3043620dbf932a41" ], "author": { "name": "Alan Viverette", "email": "alanv@google.com", "time": "Tue Feb 25 09:04:49 2025 -0800" }, "committer": { "name": "Android Build Cherrypicker Worker", "email": "android-build-cherrypicker-worker@google.com", "time": "Tue Feb 25 09:04:49 2025 -0800" }, "message": "Fix type use nullability in AppSourcesAdapter\n\nBug: 396131351\nTest: m HealthFitness\nFlag: EXEMPT bugfix\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:211f2197ca2932b816969d7250847ed7f743b486)\nMerged-In: I6e6fdf8201d82ae30dd9cd98b2e8e1b1abad3e72\nChange-Id: I6e6fdf8201d82ae30dd9cd98b2e8e1b1abad3e72\n" }, { "commit": "ac4440238d9f14018578ba6b66b4308c2997a823", "tree": "5cb3938b785e6865b5fb252a473f03618e344229", "parents": [ "437fb777d2e3649f918227d7e22f082e76b26f6e", "c59c57fe8a026277da44453a7d631926936711d6" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 12 13:59:38 2025 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Feb 12 13:59:38 2025 -0800" }, "message": "Merge 25Q1 (ab/12770256) to aosp-main-future\n\nBug: 385190204\nMerged-In: I1d5ae0f2cb5d7a2fa69b7c99e78f9c9a5dc0c4dc\nChange-Id: I50077ce9ebd4cb4162438d5ab9f3b4a3a48f8673\n" }, { "commit": "437fb777d2e3649f918227d7e22f082e76b26f6e", "tree": "3728b9d589d33e2637958bbd1066c738867c35dc", "parents": [ "fbf563d2482ec8ec43a1a08034faad3d078984d1", "bee5753cef5630200d0ae4fd3043620dbf932a41" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Wed Feb 12 08:41:31 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 12 08:41:31 2025 -0800" }, "message": "Reset screen size before running any UI tests. am: bee5753cef\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3492370\n\nChange-Id: Ia5d3e7852ed3e6426700c91a802f2e7053206c2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bee5753cef5630200d0ae4fd3043620dbf932a41", "tree": "3728b9d589d33e2637958bbd1066c738867c35dc", "parents": [ "bb71ddf3b21cb4faa6f4ab5789576c93f7198a99" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Wed Feb 12 06:34:57 2025 -0800" }, "committer": { "name": "Abel Hubena", "email": "abeltsegaye@google.com", "time": "Wed Feb 12 06:51:01 2025 -0800" }, "message": "Reset screen size before running any UI tests.\n\nFix: 373243998\nFix: 377218397\nTest: atest\nFlag: NONE test fix\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:250b3dbdfc294c3b2eae8648db57802e35727050)\nMerged-In: Iaaa907e6e83fb2e369f796d5cc985b97b45956d4\nChange-Id: Iaaa907e6e83fb2e369f796d5cc985b97b45956d4\n\nATTENTION: Conflicts occurred while applying the patch.\nPlease resolve conflict markers.\n\nChange-Id: If04c00fe3e9dd47201fcc95c89f34ec0ae0d72b6\n" }, { "commit": "99359dc599434b1f00118ab1b701b12afc75cb30", "tree": "9ac631e68f878b635968222508d5e1cd355aa6be", "parents": [ "72e5e21ceda68ea8381817c92e641aa22a93df10", "539d68e18e43676adf45543ac7f1c5e73f93ea81" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed Jan 22 15:43:25 2025 -0800" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed Jan 22 15:43:25 2025 -0800" }, "message": "Merge cherrypicks of [\u0027googleplex-android-review.googlesource.com/31389613\u0027] into 25Q1-release.\n\nChange-Id: Ie22212a80978a718104ba364ccffd797b9034461\n" }, { "commit": "539d68e18e43676adf45543ac7f1c5e73f93ea81", "tree": "9ac631e68f878b635968222508d5e1cd355aa6be", "parents": [ "72e5e21ceda68ea8381817c92e641aa22a93df10" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Jan 21 10:08:54 2025 -0800" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed Jan 22 15:32:06 2025 -0800" }, "message": "Import translations. DO NOT MERGE ANYWHERE\n\nAuto-generated-cl: translation import\n\nBug: 391337100\n(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c20b51a3b1ed0d617abc7a12f13caaffba06e89e)\nMerged-In: I69426f3d2af0f4586830bdb574ed626e113d160b\nChange-Id: I69426f3d2af0f4586830bdb574ed626e113d160b\n" }, { "commit": "fbf563d2482ec8ec43a1a08034faad3d078984d1", "tree": "778d5e48cb4c6ee76cdf06503ba14c27f7799389", "parents": [ "612a4de51e841b6241312e11bafdc9ac6c657ae7", "bb71ddf3b21cb4faa6f4ab5789576c93f7198a99" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Tue Jan 21 08:40:14 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 21 08:40:14 2025 -0800" }, "message": "Pin HealthConnectTests to Kotlin 1.9 am: bb71ddf3b2\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3456779\n\nChange-Id: I694ecd7206791db3a2c68f76972c59e7b8f1f45c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bb71ddf3b21cb4faa6f4ab5789576c93f7198a99", "tree": "778d5e48cb4c6ee76cdf06503ba14c27f7799389", "parents": [ "7d07bdcfc57b1c789ec756e07d9fe48fc1883bcd" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Sat Jan 18 18:44:02 2025 +0000" }, "committer": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Sun Jan 19 19:35:22 2025 +0000" }, "message": "Pin HealthConnectTests to Kotlin 1.9\n\nHealthConnectTests does not currently compile\nwith Kotlin 2.\n\nI encourage the HealthConnectTests team to\nchange this to \"2\" to see what fails, and fix accordingly.\n\nWe hope to have all over Android over to Kotlin 2 soon\nhttps://r.android.com/3454537\n\nBug: 383569207\nFlag: EXEMPT unflaggable\nTest: presubmits\nChange-Id: Ie3b4e00e8aac016c6548d623493ac22e3ed55290\n" }, { "commit": "612a4de51e841b6241312e11bafdc9ac6c657ae7", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "f4b0b6b2fc728f6bb1c119df312fe07aaa396156", "7d07bdcfc57b1c789ec756e07d9fe48fc1883bcd" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Wed Jan 15 20:38:47 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 20:38:47 2025 -0800" }, "message": "[automerger skipped] DO NOT MERGE ANYWHERE: Add placeholder package to match updated atom. am: 1f7674a413 -s ours am: 7d07bdcfc5 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3454222\n\nChange-Id: Iff0691398b8934f3048e5452d9cb3f322b0b5674\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7d07bdcfc57b1c789ec756e07d9fe48fc1883bcd", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "65f0e97fbbc1a28b19d4b6d2c848576ba0d9d87b", "1f7674a413bfc774ed327e8b6e44da12d7278424" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Wed Jan 15 20:16:17 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 15 20:16:17 2025 -0800" }, "message": "[automerger skipped] DO NOT MERGE ANYWHERE: Add placeholder package to match updated atom. am: 1f7674a413 -s ours\n\nam skip reason: contains skip directive\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3454222\n\nChange-Id: Icee30158dcb3c95987c4e60528018df912443a86\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1f7674a413bfc774ed327e8b6e44da12d7278424", "tree": "3cd768994a11e267df64aa4369e4b7a629465707", "parents": [ "216bba2cc9eed1bcc6874c817c288f2e614f0161" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Wed Jan 15 15:13:58 2025 -0800" }, "committer": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Wed Jan 15 16:03:33 2025 -0800" }, "message": "DO NOT MERGE ANYWHERE: Add placeholder package to match updated atom.\n\nGiven this code will be never be called adding a placeholder package name for logging should not cause any issues in production.\n\nTest: atest\nBug: 358006651\nChange-Id: I657485efc7b506f5b885f8c9940c6dd2b8da9a93\n" }, { "commit": "f4b0b6b2fc728f6bb1c119df312fe07aaa396156", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "76e6b7e2d112121b9eed78309c32b7d51032df73", "65f0e97fbbc1a28b19d4b6d2c848576ba0d9d87b" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Tue Jan 07 00:38:50 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 07 00:38:50 2025 -0800" }, "message": "[automerger skipped] Use longer timeout for large insert am: d18229c740 -s ours am: 216bba2cc9 -s ours am: 65f0e97fbb -s ours\n\nam skip reason: skipped by jstembridge\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3416919\n\nChange-Id: Ib722c461dca7a7dfc35b2f6fc4586efe99d30e85\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "65f0e97fbbc1a28b19d4b6d2c848576ba0d9d87b", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "7b753b03b1e1d498228a21617cd67a2876146def", "216bba2cc9eed1bcc6874c817c288f2e614f0161" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Tue Jan 07 00:15:01 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 07 00:15:01 2025 -0800" }, "message": "[automerger skipped] Use longer timeout for large insert am: d18229c740 -s ours am: 216bba2cc9 -s ours\n\nam skip reason: skipped by jstembridge\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3416919\n\nChange-Id: Ie43fc07fc9b2eaca945aa7ea1241cdd7eb5fd117\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "216bba2cc9eed1bcc6874c817c288f2e614f0161", "tree": "7d3be85fa2bc274503ef1fb442738f76782099d9", "parents": [ "2d9cbcc7b72c9988912114fb1230557ba358300d", "d18229c74056c623b2ad49b2c11a593c67b5ef70" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Tue Jan 07 00:00:16 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jan 07 00:00:16 2025 -0800" }, "message": "[automerger skipped] Use longer timeout for large insert am: d18229c740 -s ours\n\nam skip reason: skipped by jstembridge\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3416919\n\nChange-Id: I45f58f0710956c6b10424663344a38cc136aff63\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "76e6b7e2d112121b9eed78309c32b7d51032df73", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "bbc8f7e1360b32554c3711170332a58506f1c960", "7b753b03b1e1d498228a21617cd67a2876146def" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Jan 06 17:23:34 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 06 17:23:34 2025 -0800" }, "message": "[automerger skipped] Use longer timeout for large insert am: 2d9cbcc7b7 -s ours am: 7b753b03b1 -s ours\n\nam skip reason: Merged-In Ie1de2d8c717d6236e72eaca047e3aa275d82d662 with SHA-1 3c4f04bc68 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3438899\n\nChange-Id: If30edac3f21d03665d2faa1d4e7cf0f09298eb73\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7b753b03b1e1d498228a21617cd67a2876146def", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "75c111b064289a20be688337f1d7a55397300832", "2d9cbcc7b72c9988912114fb1230557ba358300d" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Jan 06 17:00:57 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 06 17:00:57 2025 -0800" }, "message": "[automerger skipped] Use longer timeout for large insert am: 2d9cbcc7b7 -s ours\n\nam skip reason: Merged-In Ie1de2d8c717d6236e72eaca047e3aa275d82d662 with SHA-1 3c4f04bc68 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3438899\n\nChange-Id: I26786871be5e544f31c1ea52e21a29846f46d465\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2d9cbcc7b72c9988912114fb1230557ba358300d", "tree": "7d3be85fa2bc274503ef1fb442738f76782099d9", "parents": [ "8ee49f049ba13be16c72c9d5ec0eb3d20555a8a3" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Jan 06 05:09:36 2025 -0800" }, "committer": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Jan 06 05:09:36 2025 -0800" }, "message": "Use longer timeout for large insert\n\nBug: 383638247\nBug: 380787826\nBug: 386241288\nChange-Id: If8ab432e7778a588a0fc4c1e8ece09a81211430c\nMerged-In: Ie1de2d8c717d6236e72eaca047e3aa275d82d662\nMerged-In: Ie5ba0819c61776cf98a061dab4d5ea6e152e7af7\n" }, { "commit": "bbc8f7e1360b32554c3711170332a58506f1c960", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "392aade9bc45e86bb1c04256673542c6b46bc383", "75c111b064289a20be688337f1d7a55397300832" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Dec 20 09:10:28 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 20 09:10:28 2024 -0800" }, "message": "Update LocalDateTimeFormatterTest due to ICU 76 am: 75c111b064\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3426553\n\nChange-Id: I2afc8df48ff7ac8669cf39208c0bd8c6bf921ab4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "75c111b064289a20be688337f1d7a55397300832", "tree": "6f6a7291cc720d496fd53d41bc27fe228d821bfc", "parents": [ "3c4f04bc68563da79ccea28771112e6157b99ff7" ], "author": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Dec 20 13:57:32 2024 +0000" }, "committer": { "name": "Victor Chang", "email": "vichang@google.com", "time": "Fri Dec 20 15:21:23 2024 +0000" }, "message": "Update LocalDateTimeFormatterTest due to ICU 76\n\nThe UK locale data is changed in CLDR.\n\nFlag: TEST_ONLY\nBug: 385308273\nBug: 374966838\nTest: atest HealthConnectControllerExtraTests\nChange-Id: Ic5e2e5dbcb0d55d7bbfa5e891740975e5e3534e1\n" }, { "commit": "d18229c74056c623b2ad49b2c11a593c67b5ef70", "tree": "6e9e28230325a3904f80ceb7eafe970bd123efbe", "parents": [ "8c63fc40b290b5b715766fcf3373cf239437366e" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Wed Dec 18 08:24:16 2024 -0800" }, "committer": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Wed Dec 18 08:24:16 2024 -0800" }, "message": "Use longer timeout for large insert\n\nBug: 383638247\nBug: 380787826\nChange-Id: I24d62227af50f32067e8d9d56b559f67f38e5f02\nMerged-In: Ie1de2d8c717d6236e72eaca047e3aa275d82d662\nMerged-In: Ie5ba0819c61776cf98a061dab4d5ea6e152e7af7\n" }, { "commit": "392aade9bc45e86bb1c04256673542c6b46bc383", "tree": "7fcd445ae1b7afbfef4a80ec4eb087e1c7014366", "parents": [ "1a7434f9c4badeffc38d37e79e1adfb867da5e44", "3c4f04bc68563da79ccea28771112e6157b99ff7" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Tue Dec 17 01:57:10 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Dec 17 01:57:10 2024 -0800" }, "message": "Use longer timeout for large insert am: 3c4f04bc68\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3416923\n\nChange-Id: I923574a8e3c1406a6a606ee3b6b904be36b7a78b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3c4f04bc68563da79ccea28771112e6157b99ff7", "tree": "7fcd445ae1b7afbfef4a80ec4eb087e1c7014366", "parents": [ "5ec252343dbc868e250daed0b49e511de0d395e3" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Dec 16 12:09:32 2024 -0800" }, "committer": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Dec 16 12:09:32 2024 -0800" }, "message": "Use longer timeout for large insert\n\nBug: 383638247\nBug: 380787826\nChange-Id: Ie1de2d8c717d6236e72eaca047e3aa275d82d662\nMerged-In: Ie5ba0819c61776cf98a061dab4d5ea6e152e7af7\n" }, { "commit": "1a7434f9c4badeffc38d37e79e1adfb867da5e44", "tree": "3e2f272169c6f5ae3167e3be4b3f84ba1b3b2ebf", "parents": [ "60f1c0db39898cff0d3556a5e2b94c4a6cdb80f8", "5ec252343dbc868e250daed0b49e511de0d395e3" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 19:40:39 2024 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Dec 13 19:40:39 2024 -0800" }, "message": "[automerger skipped] Merge 24Q4 into AOSP main am: 5ec252343d -s ours\n\nam skip reason: Merged-In I7144e317e00113b324d7b642c6d62d7e0f30f976 with SHA-1 079db93c5d is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3412879\n\nChange-Id: I422ceb08adea872ba1f63c158704e092ed301baa\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ec252343dbc868e250daed0b49e511de0d395e3", "tree": "3e2f272169c6f5ae3167e3be4b3f84ba1b3b2ebf", "parents": [ "e98c8d35e4e8c7a026ae9f4044a4287202e3e0a0", "60f1c0db39898cff0d3556a5e2b94c4a6cdb80f8" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:23 2024 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Dec 13 11:15:23 2024 -0800" }, "message": "Merge 24Q4 into AOSP main\n\nBug: 370570306\nMerged-In: I7144e317e00113b324d7b642c6d62d7e0f30f976\nChange-Id: If37d89e6f02be85c0c5d1e956a86c3d0fe285b36\n" }, { "commit": "72e5e21ceda68ea8381817c92e641aa22a93df10", "tree": "84401b41de8607c13b1394d1b5de0fa5758aecba", "parents": [ "9e07f2e4cea78876ea5a30d1ac7dda99dad9b091", "c59c57fe8a026277da44453a7d631926936711d6" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Tue Dec 10 00:47:20 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Tue Dec 10 00:47:20 2024 +0000" }, "message": "Snap for 12770256 from c59c57fe8a026277da44453a7d631926936711d6 to 25Q1-release\n\nChange-Id: I3e7227871685f50cb1f47c2c6f1096cfb2e3f302\n" }, { "commit": "60f1c0db39898cff0d3556a5e2b94c4a6cdb80f8", "tree": "3e2f272169c6f5ae3167e3be4b3f84ba1b3b2ebf", "parents": [ "4f971694ffa438d875070e30eec64a92fbca7745", "e98c8d35e4e8c7a026ae9f4044a4287202e3e0a0" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Mon Dec 09 18:45:40 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 09 18:45:40 2024 +0000" }, "message": "[RESTRICT AUTOMERGE] Scrolls down to \"Delete app data\" before checking for the view. am: 8ee49f049b am: e98c8d35e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3380304\n\nChange-Id: If7d6eddefb075f721effa8c925f430b74aaba094\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4f971694ffa438d875070e30eec64a92fbca7745", "tree": "9db3296c32be1676d59206257a2a81b33d4b2087", "parents": [ "c34835f5a40e77fe67b15db2113a42c504b064f5", "869466d9e34eee3b17690132a391ceb953e5bb80" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Mon Dec 09 18:36:21 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 09 18:36:21 2024 +0000" }, "message": "[automerger skipped] Merge \"Change coroutine testing for kotlinx.coroutines 1.9\" into main am: 869466d9e3 -s ours\n\nam skip reason: Merged-In I7144e317e00113b324d7b642c6d62d7e0f30f976 with SHA-1 2f95f14070 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3343160\n\nChange-Id: I50af324aa99d2fa794120526fd60a842b1a82329\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c34835f5a40e77fe67b15db2113a42c504b064f5", "tree": "9db3296c32be1676d59206257a2a81b33d4b2087", "parents": [ "791b721d25f865b78e95f55fef503bce17d3340a", "079db93c5d8ecf27c0e31da7ea3a2cdd858bdbe1" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Mon Dec 09 18:36:16 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Dec 09 18:36:16 2024 +0000" }, "message": "[automerger skipped] Change coroutine testing for kotlinx.coroutines 1.9 am: 079db93c5d -s ours\n\nam skip reason: Merged-In I7144e317e00113b324d7b642c6d62d7e0f30f976 with SHA-1 2f95f14070 is already in history\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3343160\n\nChange-Id: I98ab7748c59d779c0cc5480fd9474cd6da97deab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c59c57fe8a026277da44453a7d631926936711d6", "tree": "84401b41de8607c13b1394d1b5de0fa5758aecba", "parents": [ "c9e499a3e77347999deda7665123fd65391dc88f", "b2c17705d46749656d907c1e824931814abb0acc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Dec 09 16:39:55 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 09 16:39:55 2024 +0000" }, "message": "Merge \"Added tests for UsageStatsCollector. This will allow us to cleanup DailyLoggingServiceTests and move the DailyLoggingService to the Injector.\" into main" }, { "commit": "b2c17705d46749656d907c1e824931814abb0acc", "tree": "524440027609cdef396bc8141932b7824e86a98f", "parents": [ "6fa05d228b6a79bfbcc6c816a46592564808b018" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Mon Dec 09 10:46:06 2024 +0000" }, "committer": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Mon Dec 09 11:28:19 2024 +0000" }, "message": "Added tests for UsageStatsCollector. This will allow us to cleanup\nDailyLoggingServiceTests and move the DailyLoggingService to the\nInjector.\n\nThings to do in the follow up CLs:\n1.) Merge TableSizeHelper with DatabaseStatsCollector and write tests for DatabaseStatsCollector.\n2.) Cleanup tests for DailyLoggingService.\n3.) Improve unit tests and get rid of extremely flaky host side tests.\n\nTest: atest\nFlag: NONE refactor\nChange-Id: I1d5ae0f2cb5d7a2fa69b7c99e78f9c9a5dc0c4dc\n" }, { "commit": "c9e499a3e77347999deda7665123fd65391dc88f", "tree": "bc19fc05b5d1cee3b21e007c16dc2d0fc971fea3", "parents": [ "b1133edde92bac8609e1f6ada122a08e0156716f", "69d3cf369477487e216871bee752acbe680d08c7" ], "author": { "name": "Nora Csitari", "email": "csitari@google.com", "time": "Mon Dec 09 11:02:27 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 09 11:02:27 2024 +0000" }, "message": "Merge \"Update HomeFragment CTS test with new helper methods\" into main" }, { "commit": "b1133edde92bac8609e1f6ada122a08e0156716f", "tree": "2fc7bd1fc08d37bb7f9672106f4c29da3f19eef1", "parents": [ "6fa05d228b6a79bfbcc6c816a46592564808b018", "9c0a79eb31d20b8105e86ca13f2852e8b70cc5ff" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Mon Dec 09 10:58:16 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Dec 09 10:58:16 2024 +0000" }, "message": "Merge changes I688336c4,Id498ca7a into main\n\n* changes:\n Deflakes medical UITests by: - attempting to scroll to most views before checking they exist - waiting for a new window when navigating\n Deflakes RequestHealthPermissionUITest by: - attempting to scroll to most views before checking they exist - waiting for a new window when navigating\n" }, { "commit": "e98c8d35e4e8c7a026ae9f4044a4287202e3e0a0", "tree": "77f5f1ed4de372e7b908ae27414df7a91e0c6d63", "parents": [ "869466d9e34eee3b17690132a391ceb953e5bb80", "8ee49f049ba13be16c72c9d5ec0eb3d20555a8a3" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Sat Dec 07 17:15:50 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Dec 07 17:15:50 2024 +0000" }, "message": "[RESTRICT AUTOMERGE] Scrolls down to \"Delete app data\" before checking for the view. am: 8ee49f049b\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3380304\n\nChange-Id: I233aa11162adee5c8fa1959ec814657670531d2c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9e07f2e4cea78876ea5a30d1ac7dda99dad9b091", "tree": "0d07126e2c5f7299f8bf6296d030622decaa3873", "parents": [ "001ccd9ed905b37205036a53667ad128dd7a2a25", "6fa05d228b6a79bfbcc6c816a46592564808b018" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat Dec 07 02:19:07 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Sat Dec 07 02:19:07 2024 +0000" }, "message": "Snap for 12763142 from 6fa05d228b6a79bfbcc6c816a46592564808b018 to 25Q1-release\n\nChange-Id: Id2e247a9aff3b34806adc449c1580ce903a2e1e0\n" }, { "commit": "869466d9e34eee3b17690132a391ceb953e5bb80", "tree": "b9fe8bba3cad9f5850a16432407d18dac69cec55", "parents": [ "4b16f7e76c8c04af75660f4ccf4ad2a3d1d846a4", "079db93c5d8ecf27c0e31da7ea3a2cdd858bdbe1" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Fri Dec 06 21:08:07 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Dec 06 21:08:07 2024 +0000" }, "message": "Merge \"Change coroutine testing for kotlinx.coroutines 1.9\" into main" }, { "commit": "6fa05d228b6a79bfbcc6c816a46592564808b018", "tree": "0d07126e2c5f7299f8bf6296d030622decaa3873", "parents": [ "bbac9ba5c831eab4e3457c45e168b182206f4eb6", "b14d8b519b38d9cdd4d8ad5c310fd9173af7210f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 20:58:57 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 20:58:57 2024 +0000" }, "message": "Merge \"Update NoDataPreference to match empty \u0027No apps recently accessed Health Connect\u0027\" into main" }, { "commit": "bbac9ba5c831eab4e3457c45e168b182206f4eb6", "tree": "3d164cbb734459de48c656113e7c31cb0af2423e", "parents": [ "2652d7230e730808206fa3d25592fe923d3b3e89", "14b032b8b2c587e685ec61b18e6c589bbd760dae" ], "author": { "name": "Mertcan Mermerkaya", "email": "mertcan@google.com", "time": "Fri Dec 06 19:37:24 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 19:37:24 2024 +0000" }, "message": "Merge \"Remove proto usage from framework and move protos to service\" into main" }, { "commit": "2652d7230e730808206fa3d25592fe923d3b3e89", "tree": "a80e7c38c6c19a34af6a16a0398b65f90c49da01", "parents": [ "22459d05608266067c8696dd32a92a39584af19e", "3daaebf90afc1bc5c0a40191ae3681f7fd2f0fe3" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 19:02:01 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 19:02:01 2024 +0000" }, "message": "Merge \"Fix flakiness in ExportImport API test\" into main" }, { "commit": "22459d05608266067c8696dd32a92a39584af19e", "tree": "dfa025f12d606b461d42c2d087a998cb5ee1e30f", "parents": [ "7e2507e4f687fcce8a6e3b7a13ebb7b19d32c83b", "a66f9a2e00e0dc4fa0e6ad1811c911b01ec6fdba" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 17:29:27 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 17:29:27 2024 +0000" }, "message": "Merge \"Cleanup insert* methods in TransactionManager.\" into main" }, { "commit": "14b032b8b2c587e685ec61b18e6c589bbd760dae", "tree": "fd880f104f579a5c1e7d2cdce818619449d84442", "parents": [ "0e888764180cee8488804dc6985e576b74793b0e" ], "author": { "name": "Mertcan Mermerkaya", "email": "mertcan@google.com", "time": "Fri Dec 06 14:43:28 2024 +0000" }, "committer": { "name": "Mertcan Mermerkaya", "email": "mertcan@google.com", "time": "Fri Dec 06 17:18:28 2024 +0000" }, "message": "Remove proto usage from framework and move protos to service\n\nBug: 369800543\nBug: 369801153\nBug: 369801147\nFlag: com.android.healthfitness.flags.cloud_backup_and_restore\nTest: go/testedequals\nChange-Id: Ib01f34a44121029c8e6d0ee0dc8243b54d6b198b\n" }, { "commit": "3daaebf90afc1bc5c0a40191ae3681f7fd2f0fe3", "tree": "ccc903741abefd21b70868b5ef9508c12a8b1342", "parents": [ "7e2507e4f687fcce8a6e3b7a13ebb7b19d32c83b" ], "author": { "name": "luisamez", "email": "luisamez@google.com", "time": "Fri Dec 06 16:35:04 2024 +0000" }, "committer": { "name": "luisamez", "email": "luisamez@google.com", "time": "Fri Dec 06 16:42:40 2024 +0000" }, "message": "Fix flakiness in ExportImport API test\n\nDon\u0027t drop manage health data permission until runImport has actually\nrun.\n\nTest: atest HealthFitnessIntegrationExportImportTests:android.healthconnect.tests.exportimport.ExportImportApiTest#exportDeleteDataAndThenImport_dataIsRestored\nFlag: NONE test only\nFix: 375170967\nChange-Id: Id66cc745fc376b2b52e09992c1d0fabeec707b89\n" }, { "commit": "b14d8b519b38d9cdd4d8ad5c310fd9173af7210f", "tree": "0cd7876f2af1b4cf3c279799f5837eee4785e0c5", "parents": [ "1b31522b900c1b81cd242b566c575da5fb838943" ], "author": { "name": "csitari", "email": "csitari@google.com", "time": "Fri Dec 06 14:39:48 2024 +0000" }, "committer": { "name": "csitari", "email": "csitari@google.com", "time": "Fri Dec 06 14:46:22 2024 +0000" }, "message": "Update NoDataPreference to match empty \u0027No apps recently accessed Health\nConnect\u0027\n\nexpressive theming on before - https://hsv.googleplex.com/4624311548641280\nexpressive theming on after - https://hsv.googleplex.com/6277976701272064\n\nexpressive theming off before - https://hsv.googleplex.com/6089525381038080\nexpressive theming off after - https://hsv.googleplex.com/5909805527990272\n\nBug: 378467810\nTest: manual\nFlag: NONE covered by SettingsLib\nChange-Id: I83080d9678ffcec3aa25bda4bbf49d4b979a5427\n" }, { "commit": "7e2507e4f687fcce8a6e3b7a13ebb7b19d32c83b", "tree": "c7258f3f7f88e924292660552b8a382396655ac3", "parents": [ "1b31522b900c1b81cd242b566c575da5fb838943" ], "author": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Wed Dec 04 17:00:10 2024 +0000" }, "committer": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Fri Dec 06 14:28:26 2024 +0000" }, "message": "Throw exception if getMedicalDataSources list of ids too large\n\nTest: atest\nBug: 372234605\nFlag: NONE bug fix\nChange-Id: Ia6487a549635281437afa5f1e874ea5982cdc7de\n" }, { "commit": "1b31522b900c1b81cd242b566c575da5fb838943", "tree": "57ca1e0a3729cb985ef5e9cfca311a433338f4c7", "parents": [ "f4b51e46231d874c5f2fb7e778b5383e0c6bdc1b", "e03620a95fcd2e126ec12d70ff772968545c2f69" ], "author": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Fri Dec 06 14:27:24 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 14:27:24 2024 +0000" }, "message": "Merge \"Fix flaky writeLimitExceeded / readLimitExceeded tests\" into main" }, { "commit": "69d3cf369477487e216871bee752acbe680d08c7", "tree": "7fc8b43ee9037a0d053b79fcd44fb318df7039d8", "parents": [ "eb1ec5b8e462b74ce10baa00e7ddd36df4089d2e" ], "author": { "name": "csitari", "email": "csitari@google.com", "time": "Wed Dec 04 14:02:28 2024 +0000" }, "committer": { "name": "csitari", "email": "csitari@google.com", "time": "Fri Dec 06 14:09:30 2024 +0000" }, "message": "Update HomeFragment CTS test with new helper methods\n\nTest: atest\nBug: 369210609\nFlag: NONE test refactor only\nChange-Id: I8136677439e91d83751e8dfa63fa411f3c40796f\n" }, { "commit": "f4b51e46231d874c5f2fb7e778b5383e0c6bdc1b", "tree": "80de0c05558be5f55435c1d5222ed9dc0d1d48b5", "parents": [ "78e4160060eb4df871c2e7881e53f872e39d3159", "3fed8b6ff22dbbbe80f26a16116cd2a69520d607" ], "author": { "name": "Nora Csitari", "email": "csitari@google.com", "time": "Fri Dec 06 13:54:46 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 13:54:46 2024 +0000" }, "message": "Merge \"Use TopIntroPreference with lnik to support expressive theming\" into main" }, { "commit": "a66f9a2e00e0dc4fa0e6ad1811c911b01ec6fdba", "tree": "708c338dfaca5b786d6bfdbe02989f3674b977de", "parents": [ "78e4160060eb4df871c2e7881e53f872e39d3159" ], "author": { "name": "Sameer Jain", "email": "sameerj@google.com", "time": "Fri Dec 06 12:11:12 2024 +0000" }, "committer": { "name": "Sameer Jain", "email": "sameerj@google.com", "time": "Fri Dec 06 13:09:30 2024 +0000" }, "message": "Cleanup insert* methods in TransactionManager.\n\nWe have 16 insert* methods in TransactionManager. Some of them are\nwrongly named, like insertRecords which is widely used for inserting to\nnon-records table.\n\nThis change removes unused and unnecessary ones, standardizes the naming, and puts them all together to prevent further additions.\n\nBug: 382009199\nFlag: NONE refactor\nTest: presubmits\nChange-Id: I466e516dbfa77a71e631739ec5cd34fb6ceb393e\n" }, { "commit": "9c0a79eb31d20b8105e86ca13f2852e8b70cc5ff", "tree": "8b1422ec2ccc7969f47843a0e811fd82a15397b4", "parents": [ "4f8cb70603caf87b982b5be888822aae68317bb4" ], "author": { "name": "teog@google.com", "email": "teog@google.com", "time": "Wed Dec 04 14:42:32 2024 +0000" }, "committer": { "name": "teog@google.com", "email": "teog@google.com", "time": "Fri Dec 06 10:46:11 2024 +0000" }, "message": "Deflakes medical UITests by:\n- attempting to scroll to most views before checking they exist\n- waiting for a new window when navigating\n\nTest: atest CtsHealthConnectControllerTestCases -c --iterations 50\nBug: 376085889\nFlag: NONE test fix\nChange-Id: I688336c4d67fdb592f84fd094211f8e9b0161f80\n" }, { "commit": "4f8cb70603caf87b982b5be888822aae68317bb4", "tree": "5e64596d9f15b2b210ec5be6e88375674f733e1c", "parents": [ "78e4160060eb4df871c2e7881e53f872e39d3159" ], "author": { "name": "teog@google.com", "email": "teog@google.com", "time": "Fri Dec 06 10:36:47 2024 +0000" }, "committer": { "name": "teog@google.com", "email": "teog@google.com", "time": "Fri Dec 06 10:38:36 2024 +0000" }, "message": "Deflakes RequestHealthPermissionUITest by:\n- attempting to scroll to most views before checking they exist\n- waiting for a new window when navigating\n\nTest: atest CtsHealthConnectControllerTestCases:ManageAppHealthPermissionUITest -c --iterations 50\nBug: 376085889\nFlag: NONE test fix\nChange-Id: Id498ca7ae01ed81624d098553c7a3b789e5cb25d\n" }, { "commit": "78e4160060eb4df871c2e7881e53f872e39d3159", "tree": "3435d25d28e751c36ce0720a7e0d69ddab4d163e", "parents": [ "5b7a37088e914bdf09a4df0f870829456691aea9", "34f303d07217203a447ccfe79eecb58478603711" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Fri Dec 06 10:28:35 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 10:28:35 2024 +0000" }, "message": "Merge \"Deflakes ManageAppHealthPermissionUITest by: - attempting to scroll to most views before checking they exist - waiting for a new window when navigating\" into main" }, { "commit": "5b7a37088e914bdf09a4df0f870829456691aea9", "tree": "e84201a76efa5a9cf28cb3bd48e550f9b95dbf0b", "parents": [ "700b35d23d551572ffcdbaa3a61569aaf87324dc", "650eb5e07fa62da185fb7c81e8d11ab64eed588e" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Dec 06 06:42:35 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Dec 06 06:42:35 2024 +0000" }, "message": "Merge \"Wrap ReadAccessLogsHelperTest with EnableFlags to filter out the test properly in Trunk Food.\" into main" }, { "commit": "001ccd9ed905b37205036a53667ad128dd7a2a25", "tree": "3ed54bcd5e18c908e701d1bfb4fdce1439f7e4b1", "parents": [ "57826bb969a9b77b835d2d0328b775c831f35cc9", "700b35d23d551572ffcdbaa3a61569aaf87324dc" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Dec 06 00:17:58 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Fri Dec 06 00:17:58 2024 +0000" }, "message": "Snap for 12755599 from 700b35d23d551572ffcdbaa3a61569aaf87324dc to 25Q1-release\n\nChange-Id: I7bf6e6d711df54be4d451e92bc941668eb50edf3\n" }, { "commit": "650eb5e07fa62da185fb7c81e8d11ab64eed588e", "tree": "2d02e4fc8f353a6d949b6b45087e4e62570440e9", "parents": [ "0e888764180cee8488804dc6985e576b74793b0e" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Thu Dec 05 20:29:10 2024 +0000" }, "committer": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Thu Dec 05 20:30:53 2024 +0000" }, "message": "Wrap ReadAccessLogsHelperTest with EnableFlags to filter out the test\nproperly in Trunk Food.\n\nFix: 382420051\nTest: atest HealthFitnessUnitTests\nFlag: com.android.healthfitness.flags.ecosystem_metrics\nChange-Id: I42d900d166bd8285473440fffc8e44d693d63cb8\n" }, { "commit": "700b35d23d551572ffcdbaa3a61569aaf87324dc", "tree": "3ed54bcd5e18c908e701d1bfb4fdce1439f7e4b1", "parents": [ "8e11110a24c9dbfa8c5708329c7e36d2804e6dd5", "f25cd8eeaebce67bbc13618ad0827d97dddd0012" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Thu Dec 05 20:15:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 20:15:31 2024 +0000" }, "message": "Merge \"Revert \"Update HomeFragment CTS test with new helper methods\"\" into main" }, { "commit": "8e11110a24c9dbfa8c5708329c7e36d2804e6dd5", "tree": "530b5d09c71dc4f286ae2a17d9382d175ad32393", "parents": [ "87aecc20b661329cab0b97fef5e7d62aa3e7c4d7", "4989fa2b5b34ad7b62ff035d12027c36f4e23f93" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 19:25:14 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 19:25:14 2024 +0000" }, "message": "Merge \"Use standard utils for querying number of rows\" into main" }, { "commit": "f25cd8eeaebce67bbc13618ad0827d97dddd0012", "tree": "4015e89e0b77976d55a8bd458858202a06ff1b87", "parents": [ "838f1afbe17e422b085d31c130260bb596cc8701" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Thu Dec 05 18:40:29 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 18:40:29 2024 +0000" }, "message": "Revert \"Update HomeFragment CTS test with new helper methods\"\n\nThis reverts commit 838f1afbe17e422b085d31c130260bb596cc8701.\n\nReason for revert: Droidmonitor created revert due to b/382502147. Will be verifying through ABTD before submission.\n\nChange-Id: Iee16688e22329a8597401adb591762c7d4c7c75a\n" }, { "commit": "34f303d07217203a447ccfe79eecb58478603711", "tree": "3d2aa1eea2ebb5215e5c734143e0a7384a795261", "parents": [ "0e888764180cee8488804dc6985e576b74793b0e" ], "author": { "name": "teog@google.com", "email": "teog@google.com", "time": "Wed Dec 04 13:29:55 2024 +0000" }, "committer": { "name": "teog@google.com", "email": "teog@google.com", "time": "Thu Dec 05 17:14:33 2024 +0000" }, "message": "Deflakes ManageAppHealthPermissionUITest by:\n- attempting to scroll to most views before checking they exist\n- waiting for a new window when navigating\n\nTest: atest CtsHealthConnectControllerTestCases:ManageAppHealthPermissionUITest -c --iterations 50\nBug: 376085889\nFlag: NONE test fix\nChange-Id: I7b0123e3c9e727b4bbedfbf4dd3f8ab548fe9431\n" }, { "commit": "87aecc20b661329cab0b97fef5e7d62aa3e7c4d7", "tree": "c5cf6a55cfa6861328a66349fdd8fdac49470acc", "parents": [ "0e888764180cee8488804dc6985e576b74793b0e", "791b721d25f865b78e95f55fef503bce17d3340a" ], "author": { "name": "Leo", "email": "itsleo@google.com", "time": "Thu Dec 05 16:47:35 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 05 16:47:35 2024 +0000" }, "message": "Add nfortescue@ and sophiabotz@ as HC code owners. am: 4b16f7e76c am: 791b721d25\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3391445\n\nChange-Id: I8359a770e758290908ad3133beaee3d4054d6bbe\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "791b721d25f865b78e95f55fef503bce17d3340a", "tree": "9db3296c32be1676d59206257a2a81b33d4b2087", "parents": [ "2f95f1407029d3fcf52dc4a9d3f343d7eb45f167", "4b16f7e76c8c04af75660f4ccf4ad2a3d1d846a4" ], "author": { "name": "Leo", "email": "itsleo@google.com", "time": "Thu Dec 05 16:26:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Dec 05 16:26:04 2024 +0000" }, "message": "Add nfortescue@ and sophiabotz@ as HC code owners. am: 4b16f7e76c\n\nOriginal change: https://android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/3391445\n\nChange-Id: I7986dac37cc7b5e77a321a31eca3821b6c3d29ef\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b16f7e76c8c04af75660f4ccf4ad2a3d1d846a4", "tree": "0f9a124c260c201665a1eadaccb2d2c1adfd5842", "parents": [ "8118c6218eb28acf4a44a75ac6ce7e8eb0cfaf7d" ], "author": { "name": "Leo", "email": "itsleo@google.com", "time": "Thu Dec 05 15:42:58 2024 +0000" }, "committer": { "name": "Leo", "email": "itsleo@google.com", "time": "Thu Dec 05 15:43:51 2024 +0000" }, "message": "Add nfortescue@ and sophiabotz@ as HC code owners.\n\nChange-Id: Ia43d929a65bb46fc0fdd9bfbf1c278e7b9396f8f\n" }, { "commit": "3fed8b6ff22dbbbe80f26a16116cd2a69520d607", "tree": "f0c3c57be7a9268c1f7269f0682b116f87af6a26", "parents": [ "80c7dc430cb467eeb76db9bd1f3b590eb48f0e5b" ], "author": { "name": "csitari", "email": "csitari@google.com", "time": "Thu Nov 28 18:10:16 2024 +0000" }, "committer": { "name": "csitari", "email": "csitari@google.com", "time": "Thu Dec 05 15:40:01 2024 +0000" }, "message": "Use TopIntroPreference with lnik to support expressive theming\n\nThe padding is too small between the text and the link, raising a bug for the Settings team\n\nExpressive theming on: using TopIntroPreference https://hsv.googleplex.com/4887039932628992\nExpressive theming off: using LegacyTopIntroPreference https://hsv.googleplex.com/6498145113473024\n\nBug: 378469065\nTest: manual\nFlag: NONE guarded by expressive theming\n\nChange-Id: I57db7207de2e51e2d0233f2bbf635118173d1b87\n" }, { "commit": "0e888764180cee8488804dc6985e576b74793b0e", "tree": "5af15f65c604867c2470140cf40f13538641edd0", "parents": [ "2b40f2b95f697a81e078e04955a40e6bee8cd666", "660d11681c8fcb34a933fac80b3903b12ec513c8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 13:57:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 13:57:31 2024 +0000" }, "message": "Merge \"Revert^2 \"Add support to insert detailed access logs for Read requests.\"\" into main" }, { "commit": "2b40f2b95f697a81e078e04955a40e6bee8cd666", "tree": "6abcdd70a45d64def04b0f8c246896815e58c7fc", "parents": [ "0dce13c072cde41ade109c244d97559b7a281e92", "79316e5947bdc9542de0966ec48929ebbefb8ccd" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Thu Dec 05 13:36:54 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 13:36:54 2024 +0000" }, "message": "Merge \"Internalize all variations for inserting data within UpsertTransactionRequest.\" into main" }, { "commit": "e03620a95fcd2e126ec12d70ff772968545c2f69", "tree": "51a8cdb498c1c738e0b125017c9cd8179c72b32c", "parents": [ "0dce13c072cde41ade109c244d97559b7a281e92" ], "author": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Wed Dec 04 15:38:01 2024 +0000" }, "committer": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Thu Dec 05 13:32:33 2024 +0000" }, "message": "Fix flaky writeLimitExceeded / readLimitExceeded tests\n\nTest: atest\nFixes: 380911749\nFlag: NONE test change only\n\nChange-Id: Ib1b8dc9d94537084e9e039b225408d585450fed9\n" }, { "commit": "0dce13c072cde41ade109c244d97559b7a281e92", "tree": "0e989cfbda2212fc886a564ead92e12b1f88ad50", "parents": [ "0302d9290cc08d2b0b9767ad939a167b88db788b", "cd5fa4d2d02affe8e241bbe24652d5efde855f97" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Thu Dec 05 13:13:50 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 13:13:50 2024 +0000" }, "message": "Merge \"Wait for the screen to be unlocked in the UI tests.\" into main" }, { "commit": "0302d9290cc08d2b0b9767ad939a167b88db788b", "tree": "6c7911ce63b21dc2fac03335a5f6f3428d4d16cd", "parents": [ "1383e2e004e518ba324d68ba704260e6629afbf6", "838f1afbe17e422b085d31c130260bb596cc8701" ], "author": { "name": "Nora Csitari", "email": "csitari@google.com", "time": "Thu Dec 05 12:33:03 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 12:33:03 2024 +0000" }, "message": "Merge \"Update HomeFragment CTS test with new helper methods\" into main" }, { "commit": "660d11681c8fcb34a933fac80b3903b12ec513c8", "tree": "c1580441350b9cd4f1fc435ad432444d62e470ff", "parents": [ "09655e2a6c5e9bcb72d554e522519048d33f93b9" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Thu Dec 05 10:38:35 2024 +0000" }, "committer": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Thu Dec 05 12:26:57 2024 +0000" }, "message": "Revert^2 \"Add support to insert detailed access logs for Read requests.\"\n\nThis reverts commit 09655e2a6c5e9bcb72d554e522519048d33f93b9.\n\nReason for revert: Fixing the bug\n\nChange-Id: Id9097576a864127eb10fde9a1bfac0f0ca4d00b4\n" }, { "commit": "1383e2e004e518ba324d68ba704260e6629afbf6", "tree": "5eec218da9512c4d434f71216d2e84cbda89d129", "parents": [ "824127d48cb7c0233c4591c84c4bbee53d73b88c", "250b3dbdfc294c3b2eae8648db57802e35727050" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Thu Dec 05 12:12:22 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 05 12:12:22 2024 +0000" }, "message": "Merge \"Reset screen size before running any UI tests.\" into main" }, { "commit": "57826bb969a9b77b835d2d0328b775c831f35cc9", "tree": "39bba2eed02a56f8d608f5a038cbe90f229b36ec", "parents": [ "850ceb268069b1cd171e309a7412f6cbad7e447f", "824127d48cb7c0233c4591c84c4bbee53d73b88c" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Thu Dec 05 00:18:10 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Thu Dec 05 00:18:10 2024 +0000" }, "message": "Snap for 12748980 from 824127d48cb7c0233c4591c84c4bbee53d73b88c to 25Q1-release\n\nChange-Id: I7ed4b78cbe8215539789cca1ffaa761b08adace0\n" }, { "commit": "4989fa2b5b34ad7b62ff035d12027c36f4e23f93", "tree": "c37594bf0905bf1b9f81fd26745a0eb4193e0d4b", "parents": [ "824127d48cb7c0233c4591c84c4bbee53d73b88c" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Wed Dec 04 10:12:37 2024 +0000" }, "committer": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Wed Dec 04 17:08:12 2024 +0000" }, "message": "Use standard utils for querying number of rows\n\nAnd name methods consistently everywhere.\n\nTest: atest HealthFitnessUnitTests\nFlag: EXEMPT refactor\nChange-Id: Ia83cea58b511cc7df2fd7a32eaa84d4eb7d929b6\n" }, { "commit": "838f1afbe17e422b085d31c130260bb596cc8701", "tree": "08224132600a9fe77089f8c98b0be9b1462b231f", "parents": [ "eb1ec5b8e462b74ce10baa00e7ddd36df4089d2e" ], "author": { "name": "csitari", "email": "csitari@google.com", "time": "Wed Dec 04 14:02:28 2024 +0000" }, "committer": { "name": "csitari", "email": "csitari@google.com", "time": "Wed Dec 04 14:45:20 2024 +0000" }, "message": "Update HomeFragment CTS test with new helper methods\n\nTest: atest\nBug: 369210609\nFlag: NONE test refactor only\nChange-Id: If48c70b0b75d5ff60ccad92a2f31177c94598a85\n" }, { "commit": "cd5fa4d2d02affe8e241bbe24652d5efde855f97", "tree": "f76ffeed9048443f8ce53eaa69e7f11485d7d61e", "parents": [ "824127d48cb7c0233c4591c84c4bbee53d73b88c" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Wed Dec 04 11:48:27 2024 +0000" }, "committer": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Wed Dec 04 14:42:51 2024 +0000" }, "message": "Wait for the screen to be unlocked in the UI tests.\n\nOtherwise they often flake like this\nhttps://android-build.corp.google.com/test_investigate/invocation/I51200010341941513/test/TR45229537633387289/\n\nTest: atest CtsHealthConnectControllerTestCases\nFlag: TEST_ONLY\nChange-Id: I39baaa84456a09e69032e634f696ebec30c6a7fd\n" }, { "commit": "79316e5947bdc9542de0966ec48929ebbefb8ccd", "tree": "0c563d171ec8487923565c1202c1379863ee78ce", "parents": [ "824127d48cb7c0233c4591c84c4bbee53d73b88c" ], "author": { "name": "Sameer Jain", "email": "sameerj@google.com", "time": "Tue Dec 03 11:12:13 2024 +0000" }, "committer": { "name": "Sameer Jain", "email": "sameerj@google.com", "time": "Wed Dec 04 14:24:34 2024 +0000" }, "message": "Internalize all variations for inserting data within\nUpsertTransactionRequest.\n\nTest: presubmit\nFlag: NONE refactor\nBug: 381513409\nChange-Id: Ib899e8f4398ef068e4ccccbd83db6647ed574d16\n" }, { "commit": "824127d48cb7c0233c4591c84c4bbee53d73b88c", "tree": "39bba2eed02a56f8d608f5a038cbe90f229b36ec", "parents": [ "af660d8d811bfc07618c3325b39ed0a7cca2a94b", "2f95f1407029d3fcf52dc4a9d3f343d7eb45f167" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Wed Dec 04 14:15:23 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Dec 04 14:15:23 2024 +0000" }, "message": "[automerger skipped] Change coroutine testing for kotlinx.coroutines 1.9 am: 2f95f14070 -s ours\n\nam skip reason: Merged-In I7144e317e00113b324d7b642c6d62d7e0f30f976 with SHA-1 188b6b8821 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/HealthFitness/+/30691888\n\nChange-Id: I3841270014782a460d6c8b17d70fe5eb1a5f20c1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "250b3dbdfc294c3b2eae8648db57802e35727050", "tree": "5eec218da9512c4d434f71216d2e84cbda89d129", "parents": [ "af660d8d811bfc07618c3325b39ed0a7cca2a94b" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Wed Dec 04 12:24:15 2024 +0000" }, "committer": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Wed Dec 04 12:25:16 2024 +0000" }, "message": "Reset screen size before running any UI tests.\n\nChange-Id: Iaaa907e6e83fb2e369f796d5cc985b97b45956d4\nFix: 373243998\nFix: 377218397\nTest: atest\nFlag: NONE test fix\n" }, { "commit": "af660d8d811bfc07618c3325b39ed0a7cca2a94b", "tree": "39bba2eed02a56f8d608f5a038cbe90f229b36ec", "parents": [ "862bfae98496ec2239d6bee232968add5a6d7b5c", "9d6528adc6f88744abd60f6d5fd33657926c4aff" ], "author": { "name": "Aisha Hasan", "email": "aihasan@google.com", "time": "Wed Dec 04 11:22:08 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 04 11:22:08 2024 +0000" }, "message": "Merge \"Date navigation view in entries screen not resetting when navigating back to data and access screen\" into main" }, { "commit": "862bfae98496ec2239d6bee232968add5a6d7b5c", "tree": "9152fb3eb681583c04a8a83d93fb672934e059d7", "parents": [ "defd3e79e1cb4494126015686a0ea2491bc4f939", "22a53b649e674c122af72a5de5d15466e7a0395d" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Wed Dec 04 10:41:56 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Dec 04 10:41:56 2024 +0000" }, "message": "Merge changes Ic45dbac1,Ibbf44e5b into main\n\n* changes:\n Deflakes Additional permission request screens tests by: - attempting to scroll to most views before checking they exist - wait for a new window when navigating\n Deflakes new IA tests by: - attempting to scroll to most views before checking they exist - wait for a new window when navigating\n" }, { "commit": "850ceb268069b1cd171e309a7412f6cbad7e447f", "tree": "bdde9c23b6de0a89b9f7abceb16981f5f40e5a68", "parents": [ "1a313b73a37d47acf40cc6959b49324453af3dd0", "bc0cfed836f66ae41b34ad6f02ec4de7978fe8c6" ], "author": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed Dec 04 00:18:32 2024 +0000" }, "committer": { "name": "Android Build Coastguard Worker", "email": "android-build-coastguard-worker@google.com", "time": "Wed Dec 04 00:18:32 2024 +0000" }, "message": "Snap for 12742097 from bc0cfed836f66ae41b34ad6f02ec4de7978fe8c6 to 25Q1-release\n\nChange-Id: I5e6110096152aa6be4c0ad71a89f5267c9239894\n" }, { "commit": "defd3e79e1cb4494126015686a0ea2491bc4f939", "tree": "b0a8a65cae56c8bbecea75a17a570dd909f04d9f", "parents": [ "bc0cfed836f66ae41b34ad6f02ec4de7978fe8c6", "09655e2a6c5e9bcb72d554e522519048d33f93b9" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Tue Dec 03 22:35:06 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 22:35:06 2024 +0000" }, "message": "Merge \"Revert \"Add support to insert detailed access logs for Read requests.\"\" into main" }, { "commit": "2f95f1407029d3fcf52dc4a9d3f343d7eb45f167", "tree": "154e5d8b282fe468a739f6a93c5dc820ab0f7015", "parents": [ "6b4e8da9b377e7a4e5fe62cc633dec5f017c5888" ], "author": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Thu Nov 07 19:09:50 2024 +0000" }, "committer": { "name": "Dave Mankoff", "email": "mankoff@google.com", "time": "Tue Dec 03 20:52:41 2024 +0000" }, "message": "Change coroutine testing for kotlinx.coroutines 1.9\n\nSee\nhttps://github.com/Kotlin/kotlinx.coroutines/blob/master/kotlinx-coroutines-test/MIGRATION.md\nfor details.\n\nBug: 369137871\nFlag: TEST_ONLY\nTest: presubmits\nChange-Id: I7144e317e00113b324d7b642c6d62d7e0f30f976\nMerged-In: I7144e317e00113b324d7b642c6d62d7e0f30f976\n(cherry picked from commit 188b6b88211b6f36fa35308a61e18af7871d033a)\nDISABLE_TOPIC_PROTECTOR\n" }, { "commit": "bc0cfed836f66ae41b34ad6f02ec4de7978fe8c6", "tree": "bdde9c23b6de0a89b9f7abceb16981f5f40e5a68", "parents": [ "ba3d95721d7205cea3d976f911b373af7dfc1609", "fa89209eaae0b10f096288484cacbed44019c177" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Tue Dec 03 19:46:33 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 19:46:33 2024 +0000" }, "message": "Merge \"Import translations. DO NOT MERGE ANYWHERE\" into main" }, { "commit": "09655e2a6c5e9bcb72d554e522519048d33f93b9", "tree": "42b29e818c5edda72d4d18b572d7ad009dd05f90", "parents": [ "d8e2ada33311c89c9f10d72cb0ac5b8bc0d61a5e" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Tue Dec 03 19:31:04 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 19:31:04 2024 +0000" }, "message": "Revert \"Add support to insert detailed access logs for Read requests.\"\n\nThis reverts commit d8e2ada33311c89c9f10d72cb0ac5b8bc0d61a5e.\n\nReason for revert: Droidmonitor created revert due to b/382084523. Will be verifying through ABTD before submission.\n\nChange-Id: I9adf59e4c2941f0e6a58c298859af4d076fa8039\n" }, { "commit": "ba3d95721d7205cea3d976f911b373af7dfc1609", "tree": "7de7b0d5d5545548e60191ef5a13356fa91febe4", "parents": [ "563715fa016a31c6087b5cf03d183471f2a6cedd", "77236ec2819ec51677c3c001b9572d8ca8a4e47e" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 15:49:34 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 15:49:34 2024 +0000" }, "message": "Merge \"Fix data type UI tests when the PHR flag is disabled.\" into main" }, { "commit": "9d6528adc6f88744abd60f6d5fd33657926c4aff", "tree": "cd951166cdda912a260a2f7bc32d14b474937e35", "parents": [ "eb1ec5b8e462b74ce10baa00e7ddd36df4089d2e" ], "author": { "name": "Aisha Hasan", "email": "aihasan@google.com", "time": "Tue Dec 03 15:03:24 2024 +0000" }, "committer": { "name": "Aisha Hasan", "email": "aihasan@google.com", "time": "Tue Dec 03 15:03:24 2024 +0000" }, "message": "Date navigation view in entries screen not resetting when navigating back to data and access screen\n\nFixes: 382036578\nFlag: com.android.healthfitness.flags.new_information_architecture\nTest: None\nChange-Id: Iaf84f5199801b8c6d77d307d09b9187277af8acf\n" }, { "commit": "22a53b649e674c122af72a5de5d15466e7a0395d", "tree": "a5c2b86d0120b129b008ec7939b9de2d272a754a", "parents": [ "3900134c8033df8398641558ee38cad9fcbf5dce" ], "author": { "name": "teog@google.com", "email": "teog@google.com", "time": "Tue Dec 03 14:42:45 2024 +0000" }, "committer": { "name": "teog@google.com", "email": "teog@google.com", "time": "Tue Dec 03 14:44:11 2024 +0000" }, "message": "Deflakes Additional permission request screens tests by:\n- attempting to scroll to most views before checking they exist\n- wait for a new window when navigating\n\nTest: atest CtsHealthConnectControllerTestCases:AdditionalPermissionsRequestUITest -c --iterations 50\nBug: 376085889\nFlag: NONE test fix\nChange-Id: Ic45dbac1a60efdb05eb7906729dd2f18ff72bbd4\n" }, { "commit": "563715fa016a31c6087b5cf03d183471f2a6cedd", "tree": "bae884b4fdbc66058ec113d0ffa0e77efac906f0", "parents": [ "44430567a819bd7027cf4e353b67afa4aa904bf4", "97eebce5ab6d7b7b933bdd196c28646bfe6c829e" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 14:23:28 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 14:23:28 2024 +0000" }, "message": "Merge \"Use CheckFlagsRule in ActivityIntensityFormatterTest.\" into main" }, { "commit": "44430567a819bd7027cf4e353b67afa4aa904bf4", "tree": "601693f2d67b2624dccfe5cf9503e1495632fb0b", "parents": [ "00ac9a3b4e63cf11ed7198fc8b36572f9987ea50", "d8e2ada33311c89c9f10d72cb0ac5b8bc0d61a5e" ], "author": { "name": "Mridul Agarwal", "email": "mridulagarwal@google.com", "time": "Tue Dec 03 14:14:04 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 14:14:04 2024 +0000" }, "message": "Merge \"Add support to insert detailed access logs for Read requests.\" into main" }, { "commit": "77236ec2819ec51677c3c001b9572d8ca8a4e47e", "tree": "75674040dec51447ce7b6a964f61d312d50853d1", "parents": [ "a05af600b920664b79d2e6b955342f6ce09f63d3" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 13:16:47 2024 +0000" }, "committer": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 14:06:34 2024 +0000" }, "message": "Fix data type UI tests when the PHR flag is disabled.\n\nDon\u0027t click \"Fitness and wellness\" button if it\u0027s the case.\n\nBonus: dump the screen when the object can\u0027t be found for easier debugging.\n\nBug: 381089588\nTest: atest CtsHealthConnectControllerTestCases\nFlag: com.android.healthfitness.flags.activity_intensity\nChange-Id: I307931ec695061430409613ddeab881cb0c3872e\n" }, { "commit": "00ac9a3b4e63cf11ed7198fc8b36572f9987ea50", "tree": "ee491d4e4676d18c7673d2ee917b943ab476c5d6", "parents": [ "a05af600b920664b79d2e6b955342f6ce09f63d3", "55deafd81058045c47e4b83aa163e090093cd6da" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Dec 03 12:15:31 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 12:15:31 2024 +0000" }, "message": "Merge \"Throw exception if list of upsert requests contains duplicates\" into main" }, { "commit": "97eebce5ab6d7b7b933bdd196c28646bfe6c829e", "tree": "233dcb37eb1a64517f01db9728d668fd6ffd843e", "parents": [ "a05af600b920664b79d2e6b955342f6ce09f63d3" ], "author": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 12:03:20 2024 +0000" }, "committer": { "name": "Roman Didukh", "email": "rdidukh@google.com", "time": "Tue Dec 03 12:06:17 2024 +0000" }, "message": "Use CheckFlagsRule in ActivityIntensityFormatterTest.\n\nBug: 380186508\nTest: atest HealthConnectControllerDataScreensOldTests:ActivityIntensityFormatterTest\nFlag: com.android.healthfitness.flags.activity_intensity\nChange-Id: I3349b81adf579642f8a77db86d6385892d6ee923\n" }, { "commit": "a05af600b920664b79d2e6b955342f6ce09f63d3", "tree": "fe67313ff98e842602f60d9110e0cb23e92ad8f4", "parents": [ "3a39019bd41b55157e6720b88af1463e2f4aed71", "18a4e0c83df7c5651a081caea4293b0e3fbe4a87" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Dec 03 11:35:28 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 11:35:28 2024 +0000" }, "message": "Merge \"Migrate tests to SQLiteDatabaseFixture\" into main" }, { "commit": "3900134c8033df8398641558ee38cad9fcbf5dce", "tree": "6e7b458fac880bab0d537ebf10dd8a4c5ad8ba1b", "parents": [ "3a39019bd41b55157e6720b88af1463e2f4aed71" ], "author": { "name": "teog@google.com", "email": "teog@google.com", "time": "Fri Nov 29 19:11:10 2024 +0000" }, "committer": { "name": "teog@google.com", "email": "teog@google.com", "time": "Tue Dec 03 10:55:10 2024 +0000" }, "message": "Deflakes new IA tests by:\n- attempting to scroll to most views before checking they exist\n- wait for a new window when navigating\n\nTest: atest CtsHealthConnectControllerTestCases -c --iterations 50\nBug: 376085889\nFlag: NONE test fix\nChange-Id: Ibbf44e5b754903d793762ab140ed14be5ad2933b\n" }, { "commit": "3a39019bd41b55157e6720b88af1463e2f4aed71", "tree": "9147742fdebfa09c07626904a4e5495924eeb25f", "parents": [ "4eef294cad6cc43a7ec7f49838ba00fe9cfc4964", "317d0f016c4f99cd90cee98afc22906b1cd7453e" ], "author": { "name": "Teo Georgescu", "email": "teog@google.com", "time": "Tue Dec 03 10:52:22 2024 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Dec 03 10:52:22 2024 +0000" }, "message": "Merge \"Fixes flaky CTS UI test by: - attempting to scroll to a view before checking for its presence - replacing waitUntilIdle() with wait() until we see a new window.\" into main" }, { "commit": "55deafd81058045c47e4b83aa163e090093cd6da", "tree": "4a6d1a714c6892bf5bc49d15280eba4ee7945b6c", "parents": [ "00d6169a771d5960d05c3099cea1995dde6100e6" ], "author": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Mon Dec 02 15:30:44 2024 +0000" }, "committer": { "name": "Sophia Botz", "email": "sophiabotz@google.com", "time": "Tue Dec 03 10:38:17 2024 +0000" }, "message": "Throw exception if list of upsert requests contains duplicates\n\nBug: 381205582\nTest: atest\nFlag: NONE bug fix\nChange-Id: Icf89d65749941f8492bc3a4c554d74ab6cdea6e8\n" }, { "commit": "18a4e0c83df7c5651a081caea4293b0e3fbe4a87", "tree": "f4a76b92249fe0d14b4266a845601eefc9dff93b", "parents": [ "ef44402b2c2dde5efe62c968accf7e98d44986c2" ], "author": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Mon Dec 02 20:40:25 2024 +0000" }, "committer": { "name": "James Stembridge", "email": "jstembridge@google.com", "time": "Tue Dec 03 10:30:51 2024 +0000" }, "message": "Migrate tests to SQLiteDatabaseFixture\n\nBug: 377844836\nTest: atest HealthFitnessUnitTests\nFlag: TEST_ONLY\nChange-Id: I3fc49c6aa295a3eb144a7dc8068ebf500e5c81b0\n" } ], "next": "4eef294cad6cc43a7ec7f49838ba00fe9cfc4964" }