)]}' { "log": [ { "commit": "ae7a1df57df8680ee221c64c995287131364fd8c", "tree": "e6c56e0f705bef107dea381767e5cce1f1095664", "parents": [ "7588fa68660be986abf983eddfe2beb6d7db5085", "b625b562c41cd3f68aebdd33f96f766209ecfa15" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 19 18:19:25 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:19:25 2022 +0000" }, "message": "Merge \"[pm] forbid deletion of protected packages\" into qt-dev am: b625b562c4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19935572\n\nChange-Id: Ic0c235c82f13e4e8f09b35bb9f30134cfcf8617e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "7588fa68660be986abf983eddfe2beb6d7db5085", "tree": "f1ff39a19726e42d4d752c937ce9b9b44554ac3a", "parents": [ "f3c6684b16f706fa715cc2edaf6fdcd476ce3d82", "6505ed1695a1509e7e16dc5898924adcb3e422c5" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Sep 19 18:18:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:18:04 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev am: 6505ed1695\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19815423\n\nChange-Id: Ia708dba5893575578ae7a383dd823a3726b5aab4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f3c6684b16f706fa715cc2edaf6fdcd476ce3d82", "tree": "1ec5aa948b323cf4faecbb6b939319db4b069006", "parents": [ "02b525316e6df26940d75b178dd595f609495c5e", "c184d7b7217b9632169964da81ed11edff08b72f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Mon Sep 19 18:17:30 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Sep 19 18:17:30 2022 +0000" }, "message": "Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev am: c184d7b721\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: I6ea11a78ee30c911dee0fe1e71b1bfb422751951\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "02b525316e6df26940d75b178dd595f609495c5e", "tree": "1ec5aa948b323cf4faecbb6b939319db4b069006", "parents": [ "85d0cb310cc3d7f600d88c95e036ad85c7d7d734", "a30148b8a40a36cababba1ff434d053cfd7dd6e3" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Thu Sep 15 17:12:32 2022 +0000" }, "committer": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Mon Sep 19 13:46:09 2022 +0000" }, "message": "[conflict] [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock am: a30148b8a4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19667859\n\nChange-Id: Ie85c312ad47c5be276010f0a96d64e058be2fbda\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b625b562c41cd3f68aebdd33f96f766209ecfa15", "tree": "2d31d0fc711f13c09c87c98c56b6ff2b78152552", "parents": [ "6505ed1695a1509e7e16dc5898924adcb3e422c5", "2e42c393f2d5521d20acd9281d411a0fbc6196c3" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Thu Sep 15 20:58:34 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 15 20:58:34 2022 +0000" }, "message": "Merge \"[pm] forbid deletion of protected packages\" into qt-dev" }, { "commit": "6505ed1695a1509e7e16dc5898924adcb3e422c5", "tree": "4f5647f9d2e8fc31f48f26e001e3761724b68d9e", "parents": [ "c184d7b7217b9632169964da81ed11edff08b72f", "2bc4d49c2b0265f5de1c62d1342b1426cc5e1377" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Thu Sep 15 16:43:41 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 15 16:43:41 2022 +0000" }, "message": "Merge \"Include all enabled services when FEEDBACK_ALL_MASK.\" into qt-dev" }, { "commit": "c184d7b7217b9632169964da81ed11edff08b72f", "tree": "f7bb472ce43086a1f38c1641ca64143aff149353", "parents": [ "3fe8fdc4dc2a4172d99faf2a398fa4ba77bbd4a5", "a30148b8a40a36cababba1ff434d053cfd7dd6e3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Sep 15 16:39:42 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 15 16:39:42 2022 +0000" }, "message": "Merge \"[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\" into qt-dev" }, { "commit": "a30148b8a40a36cababba1ff434d053cfd7dd6e3", "tree": "dd700a4332ee61b6f0b51ec64da48e93f31383c8", "parents": [ "e893eff6f2e229e71f47b74f2634b756adf6b681" ], "author": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Thu Aug 18 12:04:43 2022 +0000" }, "committer": { "name": "Matt Pietal", "email": "mpietal@google.com", "time": "Wed Sep 14 14:49:28 2022 +0000" }, "message": "[DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock\n\nAfter PUK unlock, multiple calls to\nKeyguardSecurityContainerController#dismiss() were being called from\nthe KeyguardSimPukViewController, which begins the transition to the\nnext security screen, if any. At the same time, other parts of the\nsystem, also listening to SIM events, recognize the PUK unlock and\ncall KeyguardSecurityContainer#showSecurityScreen, which updates which\nsecurity method comes next. After boot, this should be one of PIN,\nPassword, Pattern, assuming they have a security method. If one of the\nfirst dismiss() calls comes AFTER the security method changes, this is\nincorrectly recognized by the code as a successful\nPIN/pattern/password unlock. This causes the keyguard to be marked as\ndone, causing screen flickers and incorrect system state.\n\nThe solution: every call to dismiss() should include a new parameter\nfor the security method used. If there is a difference between this\nparameter and the current value in KeyguardSecurityContainerCallback,\nignore the request, as the system state has changed.\n\nBug: 218500036\nTest: atest KeyguardSecurityContainerTest\n\nMerged-In: I7c8714a177bc85fbce92f6e8fe911f74ca2ac243\nChange-Id: I30226bc7b5eda9480d471b35fe81e106b0491ff8\n" }, { "commit": "2e42c393f2d5521d20acd9281d411a0fbc6196c3", "tree": "d737bc9bbd4ce8596679a46d70d44b2c1c61039a", "parents": [ "3fe8fdc4dc2a4172d99faf2a398fa4ba77bbd4a5" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Fri Sep 09 14:50:31 2022 -0700" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Mon Sep 12 17:26:02 2022 -0700" }, "message": "[pm] forbid deletion of protected packages\n\nBUG: 242996180\nTest: adb shell pm uninstall --user 0 com.google.android.apps.work.oobconfig\nTest: Verified with the command above. Before this CL, the package can\nbe deleted. After this CL, the deletion will fail.\n\nChange-Id: Iba408e536b340ea5d66ab499442c0c4f828fa36f\n(cherry picked from commit 15f85c7fa97fe9faa540e6ad9e850990f46a5cca)\nMerged-In: Iba408e536b340ea5d66ab499442c0c4f828fa36f\n" }, { "commit": "85d0cb310cc3d7f600d88c95e036ad85c7d7d734", "tree": "2c8513f2b8b5cb93c381608e5c9323bb3517059d", "parents": [ "14246ca9b8e5d514a18c56ea253031bf588e2cfb", "3fe8fdc4dc2a4172d99faf2a398fa4ba77bbd4a5" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Wed Sep 07 18:33:19 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 07 18:33:19 2022 +0000" }, "message": "Merge \"Fix system zen rules by using owner package name if caller is system\" into qt-dev am: 3fe8fdc4dc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868480\n\nChange-Id: Ibcf7736667abc27920b1b86fab2499ee0f723628\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3fe8fdc4dc2a4172d99faf2a398fa4ba77bbd4a5", "tree": "0de9d3e41d93989e01c937f1df4bb4af21cd619b", "parents": [ "cef7f19369d1897f3466c8164ac820d1fda4f925", "dbfe869c30480524e63edc7ada04b6728793a713" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Wed Sep 07 18:09:40 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 07 18:09:40 2022 +0000" }, "message": "Merge \"Fix system zen rules by using owner package name if caller is system\" into qt-dev" }, { "commit": "14246ca9b8e5d514a18c56ea253031bf588e2cfb", "tree": "66e22e2b1c74af42b4bc0d6c09f5bb37198988b2", "parents": [ "8862cac36639f8dbe9dd26dd69b5f1ef13cec262", "cef7f19369d1897f3466c8164ac820d1fda4f925" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 07 03:39:17 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 07 03:39:17 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Check permission for VoiceInteraction\" into qt-dev am: cef7f19369\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236\n\nChange-Id: I6820bac07063783295faf02f47dde9578197ef81\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8862cac36639f8dbe9dd26dd69b5f1ef13cec262", "tree": "66e22e2b1c74af42b4bc0d6c09f5bb37198988b2", "parents": [ "e5fdd7f0dedb0f0df22c6be3f3a982e1947a59f5", "e4e77f45700bcbc56aa6d6ffc094e0e0ae78190a" ], "author": { "name": "Ivan Chiang", "email": "chiangi@google.com", "time": "Wed Sep 07 03:39:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Sep 07 03:39:13 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction am: e4e77f4570\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18803236\n\nChange-Id: Ifddc01d108d8a056617725cb88ff47d14651bd94\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cef7f19369d1897f3466c8164ac820d1fda4f925", "tree": "ddfdca0524e49a496cd27f6e7187fe355dd35b7c", "parents": [ "380ec03dee699c138d16fb734d56ab19ad581bf8", "e4e77f45700bcbc56aa6d6ffc094e0e0ae78190a" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Sep 07 03:10:24 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 07 03:10:24 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Check permission for VoiceInteraction\" into qt-dev" }, { "commit": "e5fdd7f0dedb0f0df22c6be3f3a982e1947a59f5", "tree": "1d14336acaad0d8b166e29b36527bcfc5c65a07e", "parents": [ "9f864c4b23691e7a94f798f3bff93095df734ee7", "380ec03dee699c138d16fb734d56ab19ad581bf8" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Tue Sep 06 23:34:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 06 23:34:37 2022 +0000" }, "message": "Merge \"Trim any long string inputs that come in to AutomaticZenRule\" into qt-dev am: 380ec03dee\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816794\n\nChange-Id: I86c52b898436188c231a44b342c0ccd1672e07dd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "380ec03dee699c138d16fb734d56ab19ad581bf8", "tree": "1ef1e6d70a0c93319e758c2ca1a1d1b00929a734", "parents": [ "0b5ceb8cd2cb2e1fc9a274a711f49698d152d119", "c4b2c877ec28e2473104d9fcdcf321bd81da881b" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Tue Sep 06 23:01:44 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 06 23:01:44 2022 +0000" }, "message": "Merge \"Trim any long string inputs that come in to AutomaticZenRule\" into qt-dev" }, { "commit": "dbfe869c30480524e63edc7ada04b6728793a713", "tree": "4b7e008407f8658ba81766ee714542be7703e070", "parents": [ "0b5ceb8cd2cb2e1fc9a274a711f49698d152d119" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Tue Sep 06 16:14:16 2022 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Tue Sep 06 21:20:11 2022 +0000" }, "message": "Fix system zen rules by using owner package name if caller is system\n\nPreviously were unable to add new zen rules because rules added via the settings pages were getting registered under package \"com.android.settings\", which then were not considered \"system rules\". These rules should have package android, so when we can trust the caller (via checking that the caller is system) we should be taking the package name from the owner of the rule.\n\nBug: 245236706\nBug: 242537431\nTest: NMSTest; manual\n\nChange-Id: Id69b671592396ac3304862dadbe73de328a8e27a\nMerged-In: Id69b671592396ac3304862dadbe73de328a8e27a\n" }, { "commit": "9f864c4b23691e7a94f798f3bff93095df734ee7", "tree": "333e41a5cd89fd0ffac2c0295713d310781e8d81", "parents": [ "b5e74c1c7e3e488a39b5343a3239ae93e09cf0b6", "0b5ceb8cd2cb2e1fc9a274a711f49698d152d119" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 06 15:34:43 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 06 15:34:43 2022 +0000" }, "message": "Merge \"Validate package name passed to setApplicationRestrictions.\" into qt-dev am: 0b5ceb8cd2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19747771\n\nChange-Id: Ie6bc78bc892b8ae40b1acb095cbb2a49ee3d0452\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "0b5ceb8cd2cb2e1fc9a274a711f49698d152d119", "tree": "3349b45eff4af9aa7d584542865f39fb9cd3a308", "parents": [ "fcc640c5783a40bb2375883ad8764db31b49aea1", "cfcfe6ca8c545f78603c05e23687f8638fd4b51d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Sep 06 15:05:26 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 06 15:05:26 2022 +0000" }, "message": "Merge \"Validate package name passed to setApplicationRestrictions.\" into qt-dev" }, { "commit": "b5e74c1c7e3e488a39b5343a3239ae93e09cf0b6", "tree": "6930f7795abe1c8694a424b55e2d074ebc1a246b", "parents": [ "02101eec313a6d34c3ea0029659c85bdb1db25c1", "fcc640c5783a40bb2375883ad8764db31b49aea1" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Sep 01 22:46:01 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Sep 01 22:46:01 2022 +0000" }, "message": "Check rule package name in ZenModeHelper.addAutomaticRule am: fcc640c578\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19744482\n\nChange-Id: I256726db11f0af20fbf9fe506c63280a42b3343a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2bc4d49c2b0265f5de1c62d1342b1426cc5e1377", "tree": "af751fa95932272844b41f1a534e655f5c193da6", "parents": [ "adafc9cb0ffcbf534e2b540f215d059e4de327b0" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Thu Sep 01 10:14:24 2022 -0700" }, "committer": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Thu Sep 01 20:17:54 2022 +0000" }, "message": "Include all enabled services when FEEDBACK_ALL_MASK.\n\nBug: 243849844\nTest: m sts;\n sts-tradefed run sts-dynamic-develop -m CtsAccessibilityTestCases\nChange-Id: I4f93e06d1066085bd64e8f09882de2f4a72a0633\n" }, { "commit": "c4b2c877ec28e2473104d9fcdcf321bd81da881b", "tree": "8ddb0138577da13e5a0f2894dc97ec6861fc2c40", "parents": [ "adafc9cb0ffcbf534e2b540f215d059e4de327b0" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Mon Aug 29 17:40:14 2022 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Sep 01 18:54:21 2022 +0000" }, "message": "Trim any long string inputs that come in to AutomaticZenRule\n\nThis change both prevents any rules from being unable to be written to disk and also avoids risk of running out of memory while handling all the zen rules.\n\nBug: 242703460\nBug: 242703505\nBug: 242703780\nBug: 242704043\nBug: 243794204\nTest: cts AutomaticZenRuleTest; atest android.app.AutomaticZenRuleTest; manually confirmed each exploit example either saves the rule successfully with a truncated string (in the case of name \u0026 conditionId) or may fail to save the rule at all (if the owner/configactivity is invalid). Additionally ran the memory-exhausting PoC without device crashes.\n\nChange-Id: I110172a43f28528dd274b3b346eb29c3796ff2c6\nMerged-In: I110172a43f28528dd274b3b346eb29c3796ff2c6\n(cherry picked from commit de172ba0d434c940be9e2aad8685719731ab7da2)\n" }, { "commit": "cfcfe6ca8c545f78603c05e23687f8638fd4b51d", "tree": "dba0ff089cee8ee98968e2bbccd5d71ee562ed01", "parents": [ "adafc9cb0ffcbf534e2b540f215d059e4de327b0" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Fri Aug 19 17:08:13 2022 +0100" }, "committer": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Tue Aug 30 16:10:28 2022 +0100" }, "message": "Validate package name passed to setApplicationRestrictions.\n\nThis adds validation that the package name passed to\nsetApplicationRestrictions is in the correct format. This will avoid\nan issue where a path could be entered resulting in a file being\nwritten to an unexpected place.\n\nBug: 239701237\nTest: atest UserManagerServiceTest\nChange-Id: I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96\n(cherry picked from commit 31a582490d6e8952d24f267df47d669e3861cf67)\nMerged-In: I1ab2b7228470f10ec26fe3a608ae540cfc9e9a96\n" }, { "commit": "fcc640c5783a40bb2375883ad8764db31b49aea1", "tree": "94488733353e70fa9a1ca8e379270521565bbdec", "parents": [ "adafc9cb0ffcbf534e2b540f215d059e4de327b0" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Aug 25 16:23:12 2022 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Aug 25 21:17:32 2022 +0000" }, "message": "Check rule package name in ZenModeHelper.addAutomaticRule\n\ninstead of checking that of the configuration activity, which is potentially spoofable. The package name is verified to be the same app as the caller by NMS.\n\nThis change removes isSystemRule (called only once) in favor of checking the provided package name directly.\n\nBug: 242537431\nTest: ZenModeHelperTest, manual by verifying via provided exploit apk\nChange-Id: Ic7f350618c26a613df455a4128c9195f4b424a4d\nMerged-In: Ic7f350618c26a613df455a4128c9195f4b424a4d\n" }, { "commit": "02101eec313a6d34c3ea0029659c85bdb1db25c1", "tree": "d4e689369917bb47a51712d0b36874f0a07a8c82", "parents": [ "4c5aaf952b429dbe4a1f2784a58637c9ea90ec0e", "adafc9cb0ffcbf534e2b540f215d059e4de327b0" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Wed Aug 24 14:25:50 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 24 14:25:50 2022 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\" into qt-dev am: adafc9cb0f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979\n\nChange-Id: Ibdc5b1a989999ce369329158227f766ac7c0e1f5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4c5aaf952b429dbe4a1f2784a58637c9ea90ec0e", "tree": "d4e689369917bb47a51712d0b36874f0a07a8c82", "parents": [ "f1c5754b973d1a5146ec250eab0ea183f599954d", "7fdc96aef4e098d2271ac3a8557bd8e1ad6827f3" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Wed Aug 24 14:25:46 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 24 14:25:46 2022 +0000" }, "message": "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps. am: 7fdc96aef4\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19532979\n\nChange-Id: I57b5bdc0fe501fd27516f3f9ea3c156aa6da6c0f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "adafc9cb0ffcbf534e2b540f215d059e4de327b0", "tree": "4fe869caacea951d5f38fbb84542bb3020ecb420", "parents": [ "c2d264989a2c18af9e3f210f62eba8d987fefb5b", "7fdc96aef4e098d2271ac3a8557bd8e1ad6827f3" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Wed Aug 24 13:37:04 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 24 13:37:04 2022 +0000" }, "message": "Merge \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\" into qt-dev" }, { "commit": "f1c5754b973d1a5146ec250eab0ea183f599954d", "tree": "12fec6c2bdd39072998b68b87de5777b652a3582", "parents": [ "a8fe3a8f50fd805c558e6a65c664460909c6fd83", "c2d264989a2c18af9e3f210f62eba8d987fefb5b" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Aug 23 18:44:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 23 18:44:15 2022 +0000" }, "message": "Limit the size of NotificationChannel and NotificationChannelGroup am: c2d264989a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19696126\n\nChange-Id: Ida57571c08e6c1be93b7b70adff8fce3759c109a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c2d264989a2c18af9e3f210f62eba8d987fefb5b", "tree": "f46859b7dac5f286a1c7463eaf0b42e2a4f8e543", "parents": [ "dedf573b23e2209e16b563e9e5fa2d097401a54d" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Aug 19 09:54:23 2022 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Aug 23 13:22:33 2022 +0000" }, "message": "Limit the size of NotificationChannel and NotificationChannelGroup\n\nTest: android.app.NotificationChannelGroupTest\nTest: android.app.NotificationChannelTest\nTest: cts NotificationChannelTest\nTest: cts NotificationChannelGroupTest\nBug: 241764350\nBug: 241764340\nBug: 241764135\nBug: 242702935\nBug: 242703118\nBug: 242703202\nBug: 242702851\nBug: 242703217\nBug: 242703556\nChange-Id: I0925583ab54d6c81c415859618f6b907ab7baada\nMerged-In: I0925583ab54d6c81c415859618f6b907ab7baada\n(cherry picked from commit 3850857cb0e7f26702d5bd601731d7290390fa3b)\n" }, { "commit": "a8fe3a8f50fd805c558e6a65c664460909c6fd83", "tree": "aad092a988e20e452182f654c2efc5496aae55e3", "parents": [ "e37a0ac9f8048e45c6ef239560bab31c6a9eb93f", "dedf573b23e2209e16b563e9e5fa2d097401a54d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 20 02:56:19 2022 +0000" }, "committer": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Mon Aug 22 17:22:44 2022 +0000" }, "message": "[conflict] Merge \"Do not send AccessibilityEvent if notification is for different user.\" into qt-dev am: dedf573b23\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19607760\n\nChange-Id: I62ba986987ba4f490177e2e5bc4c981a8f4a8fe7\nMerged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "dedf573b23e2209e16b563e9e5fa2d097401a54d", "tree": "cf967849f2526990ffeb89e68e597371eb648a99", "parents": [ "e893eff6f2e229e71f47b74f2634b756adf6b681", "18f2ec86d680bff26ce9248061878894ad16e05f" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Sat Aug 20 02:34:14 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Aug 20 02:34:14 2022 +0000" }, "message": "Merge \"Do not send AccessibilityEvent if notification is for different user.\" into qt-dev" }, { "commit": "e37a0ac9f8048e45c6ef239560bab31c6a9eb93f", "tree": "2ca6ca0d45654a0b8ad7fb23fd14bde28c4cfa96", "parents": [ "dc45b9fed3f4d1d3b6f6d7e0e3c939496ba69854" ], "author": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Wed May 11 22:15:21 2022 +0000" }, "committer": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Mon Aug 15 10:47:16 2022 +0000" }, "message": "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q\n\nTest: Manually install app apks targeting Q and verifying that AR permission is not auto-granted\nTest: atest ActivityRecognitionPermissionTest\nBug: 210065877\nChange-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8\n(cherry picked from commit 84b1160cfc382f86af57f50d27864276d6c93f4a)\n" }, { "commit": "dc45b9fed3f4d1d3b6f6d7e0e3c939496ba69854", "tree": "23776d429570f2c5396b295ca64f8596a36b08f5", "parents": [ "0a761a95108dfb592788901955ba3debc6b8c005", "e893eff6f2e229e71f47b74f2634b756adf6b681" ], "author": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Mon Aug 15 09:38:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 15 09:38:09 2022 +0000" }, "message": "Merge \"DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q\" into qt-dev am: e893eff6f2\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410\n\nChange-Id: I782fb9a0fe395df6413d543b27812112a531cfea\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e4e77f45700bcbc56aa6d6ffc094e0e0ae78190a", "tree": "0441cbbc0d880bb185e8afcee846f08fb0b96baf", "parents": [ "750c978db58e2bfc408974a0d58c66c1bdb9af3d" ], "author": { "name": "Ivan Chiang", "email": "chiangi@google.com", "time": "Mon Aug 15 15:09:33 2022 +0800" }, "committer": { "name": "Ivan Chiang", "email": "chiangi@google.com", "time": "Mon Aug 15 15:09:33 2022 +0800" }, "message": "[RESTRICT AUTOMERGE] Check permission for VoiceInteraction\n\nThe service must have the CAPTURE_AUDIO_HOTWORD permission to access\nAlwaysOnHotwordDetector. If it doesn\u0027t have the permission, return\nSTATE_HARDWARE_UNAVAILABLE state. If it is not granted the\nRECORD_AUDIO permisison, it also can\u0027t start to recognize the audio.\n\nTest: manual\nTest: atest CtsVoiceInteractionTestCases\nTest: atest CtsAssistTestCases\nBug: 229793943\nChange-Id: I7d0f8d2f6af4bc4210060f0a44469db2afc7a1bb\nMerged-In: I7d0f8d2f6af4bc4210060f0a44469db2afc7a1bb\n" }, { "commit": "0a761a95108dfb592788901955ba3debc6b8c005", "tree": "23776d429570f2c5396b295ca64f8596a36b08f5", "parents": [ "b302dca7985351071446b62847055a9f3d8539d1", "84b1160cfc382f86af57f50d27864276d6c93f4a" ], "author": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Mon Aug 15 06:30:26 2022 +0000" }, "committer": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Mon Aug 15 06:35:33 2022 +0000" }, "message": "[conflict] DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q am: 84b1160cfc\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18327410\n\nChange-Id: I439bf33ed4be4f0bf2439f5565b57c9bdc398504\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e893eff6f2e229e71f47b74f2634b756adf6b681", "tree": "4ea888616add2927637b58a656af5f2ba2e1c36f", "parents": [ "750c978db58e2bfc408974a0d58c66c1bdb9af3d", "84b1160cfc382f86af57f50d27864276d6c93f4a" ], "author": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Mon Aug 15 06:08:20 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 15 06:08:20 2022 +0000" }, "message": "Merge \"DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q\" into qt-dev" }, { "commit": "18f2ec86d680bff26ce9248061878894ad16e05f", "tree": "a4a4e11f37665b70cff4564c755aa163716f033a", "parents": [ "750c978db58e2bfc408974a0d58c66c1bdb9af3d" ], "author": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Fri Aug 12 11:40:41 2022 -0700" }, "committer": { "name": "Daniel Norman", "email": "danielnorman@google.com", "time": "Fri Aug 12 19:44:08 2022 +0000" }, "message": "Do not send AccessibilityEvent if notification is for different user.\n\nBug: 237540408\nTest: BuzzBeepBlinkTest#testA11yCrossUserEventNotSent\nChange-Id: I62a875e26e214847ec72ce3c41b4f2fa8e597e07\nMerged-In: I62a875e26e214847ec72ce3c41b4f2fa8e597e07\n" }, { "commit": "b302dca7985351071446b62847055a9f3d8539d1", "tree": "fcfb8a4450a76db15c7e269eddbc5e0957c837d6", "parents": [ "53c6a79cfd9d66a9a3e5b660dcc8e967d0722e5b", "750c978db58e2bfc408974a0d58c66c1bdb9af3d" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 11 16:17:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 11 16:17:37 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo\" into qt-dev am: 750c978db5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948\n\nChange-Id: I04e528e35f4c860b0f989e7c3e063a9bc5e23cf6\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "53c6a79cfd9d66a9a3e5b660dcc8e967d0722e5b", "tree": "fcfb8a4450a76db15c7e269eddbc5e0957c837d6", "parents": [ "b618fee451226b6afc551228393ec7b1e48e1aca", "b9a934064598aa655fab4ce75c8eab6165409670" ], "author": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Thu Aug 11 16:17:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Aug 11 16:17:21 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo am: b9a9340645\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948\n\nChange-Id: I298a415227f87fa71a196cfad35c88319f265e50\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "750c978db58e2bfc408974a0d58c66c1bdb9af3d", "tree": "e183f84d361c79d2b43cbe41895e1f3beff16d11", "parents": [ "718c21f25eb1bb4800ef9321f55a26c7589c872b", "b9a934064598aa655fab4ce75c8eab6165409670" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Aug 11 15:41:19 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 11 15:41:19 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo\" into qt-dev" }, { "commit": "b9a934064598aa655fab4ce75c8eab6165409670", "tree": "010f72e1fae6faf5038f62b7151a9929b5402b4f", "parents": [ "82a9fa1667d919096af28f55da897e709b760aff" ], "author": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Tue Aug 02 03:33:39 2022 +0000" }, "committer": { "name": "Louis Chang", "email": "louischang@google.com", "time": "Thu Aug 11 02:03:47 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo\n\nThe new Intent was delivered to a non-exported activity while\n#navigateUpTo was called from an Activity of a different uid.\n\nBug: 238605611\nTest: atest StartActivityTests\nChange-Id: I854dd825bfd9a2c08851980d480d1f3a177af6cf\nMerged-In: I854dd825bfd9a2c08851980d480d1f3a177af6cf\n" }, { "commit": "b618fee451226b6afc551228393ec7b1e48e1aca", "tree": "41643519e00af78565bbe8a2d350d2738702c862", "parents": [ "8a021141fff71f0664f901c1f48cd31cfe5ec651", "718c21f25eb1bb4800ef9321f55a26c7589c872b" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Wed Aug 10 21:27:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 21:27:02 2022 +0000" }, "message": "Merge changes from topic \"cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb\" into qt-dev am: 718c21f25e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19117579\n\nChange-Id: I031700a1b2592e1f647f2e727b26610a1e48268f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8a021141fff71f0664f901c1f48cd31cfe5ec651", "tree": "ba6cb9f7a2579a0d8f654bab909ff216fa42c519", "parents": [ "1eaa443544a95c57f874876cd58f171d032668d5", "7bb9cd92bfb46bef8a739a322b25c41690171b87" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Aug 10 21:26:51 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 21:26:51 2022 +0000" }, "message": "Fix NPE when deleting old zen rules am: 7bb9cd92bf\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19202448\n\nChange-Id: I5849b48a9a54f52c1bb7a8eafa9595c160577547\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "1eaa443544a95c57f874876cd58f171d032668d5", "tree": "2804ef82b41ed75d876c1808e03a26d9ce7a7dba", "parents": [ "3ff00b522f4e59fec6a0f212ad4e192e9631c970", "eda171cffa76e3fbfd5d7da9db738d9d1da07104" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Aug 10 21:26:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 21:26:47 2022 +0000" }, "message": "Store DND rule owners am: eda171cffa\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19197499\n\nChange-Id: I9014b79735494dd9ea763ec18490bb2b12b6ecf5\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "718c21f25eb1bb4800ef9321f55a26c7589c872b", "tree": "0c88b2f0a44e2af6b1996cb1a5660c6538b2d6c3", "parents": [ "8f07d180928f48ed05f55e90a6af653ff2d5df44", "55d8e634dccf20be558dbe4eb657325a35078e43" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Wed Aug 10 20:51:29 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 10 20:51:29 2022 +0000" }, "message": "Merge changes from topic \"cherrypick-cherrypick-jr-owner-azffbn1bzv-en33flblkb\" into qt-dev\n\n* changes:\n Enforce zen rule limit on a package level.\n Fix NPE when deleting old zen rules\n Store DND rule owners\n" }, { "commit": "3ff00b522f4e59fec6a0f212ad4e192e9631c970", "tree": "74d413b480bceac6ba594a5c0f0d1c31c13a38e2", "parents": [ "d6b9cb35840cd0793eb5909530cd4f4a96ccd66e", "8f07d180928f48ed05f55e90a6af653ff2d5df44" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 10 16:42:02 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 16:42:02 2022 +0000" }, "message": "Merge \"switch TelecomManager List getters to ParceledListSlice\" into qt-dev am: 8f07d18092\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300734\n\nChange-Id: Ibc4990d59b8a9d353c05365b867d12bc798cc171\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8f07d180928f48ed05f55e90a6af653ff2d5df44", "tree": "eba226329ebc43a07ed47de66904e15da2a08654", "parents": [ "b6d3c1a0214eeec6d91a41a5722457c56118bc9e", "773cddde3d522606ff032fe8e432321c70edca09" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Aug 10 16:17:49 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 10 16:17:49 2022 +0000" }, "message": "Merge \"switch TelecomManager List getters to ParceledListSlice\" into qt-dev" }, { "commit": "d6b9cb35840cd0793eb5909530cd4f4a96ccd66e", "tree": "4fc16a82bdcc031e537a6a9d2410de8e5717d290", "parents": [ "2b28fb61b621996ff99e3d7c9de0fd8b0ee8c476", "b6d3c1a0214eeec6d91a41a5722457c56118bc9e" ], "author": { "name": "Linus Tufvesson", "email": "lus@google.com", "time": "Wed Aug 10 08:48:24 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 08:48:24 2022 +0000" }, "message": "Merge \"DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity\" into qt-dev am: b6d3c1a021\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069\n\nChange-Id: I981c9f3a7cdadf66d6ceab6e86b7ef17a14cd3ca\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2b28fb61b621996ff99e3d7c9de0fd8b0ee8c476", "tree": "4fc16a82bdcc031e537a6a9d2410de8e5717d290", "parents": [ "fb6f84fe35064be7d0e879d1632f19838647f95a", "c97296e9d9d2bad7bdd2d34c9428ba5f092fa8c1" ], "author": { "name": "Linus Tufvesson", "email": "lus@google.com", "time": "Wed Aug 10 08:48:08 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 10 08:48:08 2022 +0000" }, "message": "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity am: c97296e9d9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537069\n\nChange-Id: I51090ef67905c994de084ecc9291e95b1f2cff85\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b6d3c1a0214eeec6d91a41a5722457c56118bc9e", "tree": "a5814dbf1ea22ac0e492d73071d7adbe3a37bc9a", "parents": [ "82a9fa1667d919096af28f55da897e709b760aff", "c97296e9d9d2bad7bdd2d34c9428ba5f092fa8c1" ], "author": { "name": "Linus Tufvesson", "email": "lus@google.com", "time": "Wed Aug 10 07:59:57 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Aug 10 07:59:57 2022 +0000" }, "message": "Merge \"DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity\" into qt-dev" }, { "commit": "7fdc96aef4e098d2271ac3a8557bd8e1ad6827f3", "tree": "88ab9998065bfaba455d62e06c3ef31941326035", "parents": [ "82a9fa1667d919096af28f55da897e709b760aff" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Mon Aug 08 13:31:36 2022 +0100" }, "committer": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Mon Aug 08 13:31:36 2022 +0100" }, "message": "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\n\nThis addresses a security issue where the guest user can remove updates\nfor system apps.\n\nWith this CL, attempts to uninstall/downgrade system apps will fail if\nattempted by a non-admin user, unless the DELETE_SYSTEM_APP flag is\nspecified.\n\nThis is a fixed version of ag/17400663, to address b/236578018.\n\nBug: 170646036\nTest: manual, try uninstalling system app update as guest\nChange-Id: I5eab215cba6528aa4316ed7b20bee544915c1486\n" }, { "commit": "c97296e9d9d2bad7bdd2d34c9428ba5f092fa8c1", "tree": "dd6fcea50678b983c4df08e653cd7c8c65d86aa4", "parents": [ "b38c650ea9dbfb543a73f556fb61043103fd20ab" ], "author": { "name": "Linus Tufvesson", "email": "lus@google.com", "time": "Fri Aug 05 15:14:16 2022 +0200" }, "committer": { "name": "Linus Tufvesson", "email": "lus@google.com", "time": "Mon Aug 08 12:55:24 2022 +0200" }, "message": "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity\n\nThese windows can only be placed on private virtual displays, and as\nsuch they should not be considered when deciding if an application has\nany visible windows or not.\n\nBug:205130886\nTest:Manually verified that sample from 205130886 no longer allows\nbackground activity launches\nTest: atest CtsActivityManagerBackgroundActivityTestCases\n\nChange-Id: I76208722bbb7a407ba1f2dc4305a28226166414d\nMerged-In: I76208722bbb7a407ba1f2dc4305a28226166414d\n" }, { "commit": "fb6f84fe35064be7d0e879d1632f19838647f95a", "tree": "7482767a8a13b8d85a0b78fe4aaaae1b6f217b59", "parents": [ "cf5587d2ca4aa18957e978c8f7792f6aae0fa191", "82a9fa1667d919096af28f55da897e709b760aff" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Mon Aug 08 10:38:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 08 10:38:31 2022 +0000" }, "message": "Merge \"Revert \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\"\" into qt-dev am: 82a9fa1667\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226\n\nChange-Id: Ie9e4bde2bc2ad7fb63a770e9f56ea731786a09da\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cf5587d2ca4aa18957e978c8f7792f6aae0fa191", "tree": "7482767a8a13b8d85a0b78fe4aaaae1b6f217b59", "parents": [ "e0243c7661416b738f61126ebc6d2f598083fa40", "49d8f9325a8d103497632097010899f87f403faa" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Mon Aug 08 10:38:18 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Aug 08 10:38:18 2022 +0000" }, "message": "Revert \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\" am: 49d8f9325a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19337226\n\nChange-Id: I25f5944fcf0d975ab8f202e5701ea28b681544f2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "82a9fa1667d919096af28f55da897e709b760aff", "tree": "8609f11a1a69be6a2ea036823e6ad2439534e92c", "parents": [ "3f218c9a5e1f7c3213ceb84c15afca0d3041057b", "49d8f9325a8d103497632097010899f87f403faa" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Mon Aug 08 10:08:09 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 08 10:08:09 2022 +0000" }, "message": "Merge \"Revert \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\"\" into qt-dev" }, { "commit": "e0243c7661416b738f61126ebc6d2f598083fa40", "tree": "fffd959c5c4c7865db9ad6ecb5cd100c0eaaddd1", "parents": [ "518980587b07447894e9176157f2ea38ae106c2b", "3f218c9a5e1f7c3213ceb84c15afca0d3041057b" ], "author": { "name": "Aseem Kumar", "email": "aseemk@google.com", "time": "Fri Aug 05 18:33:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Aug 05 18:33:55 2022 +0000" }, "message": "DO NOT MERGE am: 3f218c9a5e\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17595878\n\nChange-Id: Ide4ce7536d9637969b483d05f729e6d8c800b49c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3f218c9a5e1f7c3213ceb84c15afca0d3041057b", "tree": "66c51729a3dcb8024d852ecca2a0ce468cbf24bd", "parents": [ "b38c650ea9dbfb543a73f556fb61043103fd20ab" ], "author": { "name": "Aseem Kumar", "email": "aseemk@google.com", "time": "Mon Mar 21 20:35:20 2022 -0700" }, "committer": { "name": "Aseem Kumar", "email": "aseemk@google.com", "time": "Thu Aug 04 22:21:52 2022 +0000" }, "message": "DO NOT MERGE\nMove accountname and typeName length check from Account.java to AccountManagerService.\n\nBug: 169762606\nTest: atest AccountManagerServiceTest\nChange-Id: I80fabf3a64c55837db98ff316e7e5420129c001b\n" }, { "commit": "518980587b07447894e9176157f2ea38ae106c2b", "tree": "d1b2d8a6d8c26894376985be9dcfa641c13aba60", "parents": [ "7330570922cafe612204b516394612d8b5ac9ec3" ], "author": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Tue Aug 02 13:54:51 2022 +0000" }, "committer": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Tue Aug 02 14:05:08 2022 +0000" }, "message": "RESTRICT AUTOMERGE: Fix build breakage from merge conflict.\n\nMerging 8ce3c53fcf641e4bcec73376542767bbc04e79a1 into qt-qpr1-dev resulted in a merge conflict due to a method being moved between qt-qpr1-dev and rvc-dev, such that the patch backported from rvc-dev didn\u0027t match at all. Removing the old method makes this branch match qt-dev and rvc-dev.\n\nTest: will use abtd to validate the build and the resulting logic.\n\nOriginal changes: Id82d20c9f1f2001400871b5381f52b40fbdf81c5\n\nOriginal\nBug: 231322873\n\nBreakage\nBug: 241087006\n\nChange-Id: Ic4f8d701d97aa9b6c72875df8c7eab5fd51934e0\n" }, { "commit": "7330570922cafe612204b516394612d8b5ac9ec3", "tree": "57bbb42b58dfa1e8926e6e94b732713c6d58d1e7", "parents": [ "ee9331c0d32c3d5f23ac9db5748e01f95bc2e9b6", "b38c650ea9dbfb543a73f556fb61043103fd20ab" ], "author": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Tue Aug 02 12:22:05 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Aug 02 12:22:05 2022 +0000" }, "message": "Merge \"Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior.\" into qt-dev am: b38c650ea9\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19346142\n\nChange-Id: If6faade37cf6df1dcd7a1574b341b4fc9f3dabbd\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b38c650ea9dbfb543a73f556fb61043103fd20ab", "tree": "5c6777c331ac542ba52c98ce09ca0297e1d86905", "parents": [ "c010da3a4649a02afe256cbf6dad475c2278059b", "8ce3c53fcf641e4bcec73376542767bbc04e79a1" ], "author": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Tue Aug 02 11:56:41 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 02 11:56:41 2022 +0000" }, "message": "Merge \"Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior.\" into qt-dev" }, { "commit": "773cddde3d522606ff032fe8e432321c70edca09", "tree": "83446faeba57bbdebffccd2df0cf16b9189fdeb2", "parents": [ "2c12354e77976e17a6b1787e839ea09373058401" ], "author": { "name": "Thomas Stuart", "email": "tjstuart@google.com", "time": "Thu Jun 23 14:27:43 2022 -0700" }, "committer": { "name": "Thomas Stuart", "email": "tjstuart@google.com", "time": "Mon Aug 01 16:54:58 2022 +0000" }, "message": "switch TelecomManager List getters to ParceledListSlice\n\nIt was shown that given a large phoneAccountHandles that are\nover 1 mb, a TransactionTooLarge exception can be silently thrown\ncausing an empty list to be returned.\n\nIn order to prevent this behavior, all Lists that return a\nPhoneAccountHandle or PhoneAccount have been switched to\nParceledListSlice.\n\nbug: 236263294\nTest: atest android.telecom.cts.PhoneAccountRegistrarTest\n #testRegisterPhoneAccountHandleWithFieldOverLimit\nChange-Id: I025245b2a6f8cfaca86f268851a9d8f0817e07dd\nMerged-In: I025245b2a6f8cfaca86f268851a9d8f0817e07dd\n" }, { "commit": "ee9331c0d32c3d5f23ac9db5748e01f95bc2e9b6", "tree": "0ebe3af9141414546ca216a7def02be02e878abf", "parents": [ "c1d13967511711d0ca4dddcaf7129618184a47dd", "c010da3a4649a02afe256cbf6dad475c2278059b" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Wed Jul 20 04:39:11 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 04:39:11 2022 +0000" }, "message": "Stop crashing the system on hitting the alarm limit am: c010da3a46\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19105069\n\nChange-Id: I0fe52c40c5e9d38ea5c4d31dd901c1c03d5f8ccb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c010da3a4649a02afe256cbf6dad475c2278059b", "tree": "d4b49af58e18cf96a5ebafb6e896f02911f5bae4", "parents": [ "c38cc3e355718577192da8f544d21fd0be5f6be2" ], "author": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Mon Jun 27 14:01:16 2022 -0700" }, "committer": { "name": "Suprabh Shukla", "email": "suprabh@google.com", "time": "Wed Jul 20 01:48:40 2022 +0000" }, "message": "Stop crashing the system on hitting the alarm limit\n\nExempting the system as a runtime restart is not clearly\nbetter than extreme memory and computation pressure that can result from\nthe originating spam.\nCallers in the system should guard against any spammy requests that lead\nthem to create a lot of alarms.\n\nTest: Builds, boots and existing tests should pass.\n\natest CtsAlarmManagerTestCases:UidCapTests\natest FrameworksMockingServicesTests:AlarmManagerServiceTest\n\nBug: 234441463\nChange-Id: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff\n(cherry picked from commit 3b9f3f4a0f5a661be65e287996cae8a4481a1453)\nMerged-In: Id5e94d44ac9ab24870a8213ec7583da0f592a5ff\n" }, { "commit": "8ce3c53fcf641e4bcec73376542767bbc04e79a1", "tree": "5161b943ecf5175d382814c83390840f217939b3", "parents": [ "2c12354e77976e17a6b1787e839ea09373058401" ], "author": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Mon Jul 18 13:28:21 2022 +0000" }, "committer": { "name": "Jeff DeCew", "email": "jeffdq@google.com", "time": "Wed Jul 20 01:13:11 2022 +0000" }, "message": "Block FullScreenIntent while device is in use if notification has a silencing GroupAlertBehavior.\n\nBug: 231322873\nTest: atest NotificationInterruptStateProviderImplTest\nMerged-In: Id82d20c9f1f2001400871b5381f52b40fbdf81c5\nChange-Id: Id82d20c9f1f2001400871b5381f52b40fbdf81c5\n" }, { "commit": "c1d13967511711d0ca4dddcaf7129618184a47dd", "tree": "40cb26338e48694b5eb0c85436244bf78245f669", "parents": [ "ca9d475ba4f6dfc44540165923eea2f1316c55ed", "c38cc3e355718577192da8f544d21fd0be5f6be2" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Jul 19 20:02:16 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jul 19 20:02:16 2022 +0000" }, "message": "DO NOT MERGE Limit the number of concurrently snoozed notifications am: c38cc3e355\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19205944\n\nChange-Id: I7170c031c2aa4ca409eb1965c6ed20085fac7801\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "49d8f9325a8d103497632097010899f87f403faa", "tree": "8acd8ce14ecd9c1d21426a2d580e9f804347364d", "parents": [ "a7621e0ce00f1d140b375518e26cf75693314203" ], "author": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Tue Jul 19 10:45:22 2022 +0000" }, "committer": { "name": "Oli Lan", "email": "olilan@google.com", "time": "Tue Jul 19 10:45:22 2022 +0000" }, "message": "Revert \"RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps.\"\n\nThis reverts commit a7621e0ce00f1d140b375518e26cf75693314203.\n\nReason for revert: Regression, DELETE_SYSTEM_APP flag no longer works\n\nChange-Id: I7386d1ba3d61b95836b85c52214c83b216c478e8\n" }, { "commit": "c38cc3e355718577192da8f544d21fd0be5f6be2", "tree": "4354f5c40f2caf22a4150573b1b5425ddb81ea5a", "parents": [ "2c12354e77976e17a6b1787e839ea09373058401" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Jul 01 09:49:12 2022 -0400" }, "committer": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Fri Jul 08 15:39:10 2022 +0000" }, "message": "DO NOT MERGE Limit the number of concurrently snoozed notifications\n\nTest: atest FrameworksUiServicesTests\nBug: 234441463\nChange-Id: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35\nMerged-In: I005b43979d1c708fd505c8b33ae0c8cb03ddbb35\n(cherry picked from commit 7c38394ae9c69620499a87e629edae4fe0ac4edc)\n" }, { "commit": "55d8e634dccf20be558dbe4eb657325a35078e43", "tree": "12e6f7aca30b8b375491a73679d71353b3c9d5d9", "parents": [ "7bb9cd92bfb46bef8a739a322b25c41690171b87" ], "author": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Tue Jun 28 15:43:33 2022 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Jul 07 15:50:44 2022 +0000" }, "message": "Enforce zen rule limit on a package level.\n\nThis means that a single package with multiple different condition providers or configuration activities will correctly have all of their zen rules associated with the same package rather than each owner/activity having their rules counted separately.\n\nBug: 235823407\nTest: ZenModeHelperTest\nChange-Id: I35daf9a24f546ae25a78a2d841be39072cdc5641\nMerged-In: I35daf9a24f546ae25a78a2d841be39072cdc5641\n(cherry picked from commit f4e69394eee569ac3ec5748094b9ce88a91c278c)\n" }, { "commit": "7bb9cd92bfb46bef8a739a322b25c41690171b87", "tree": "c18e221d1788827b32ea0d015b25591066b53500", "parents": [ "eda171cffa76e3fbfd5d7da9db738d9d1da07104" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Tue Jun 22 13:30:37 2021 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Jul 07 15:50:38 2022 +0000" }, "message": "Fix NPE when deleting old zen rules\n\nTest: manually revoke access for a DND app that has rules\ncreated before and after b/189332346\nBug: 191773100\nBug: 189332346\nBug: 235823407\n\nChange-Id: I069fcc124af24227fa50b61d4fc55d6dadc7a20b\nMerged-In: I069fcc124af24227fa50b61d4fc55d6dadc7a20b\n(cherry picked from commit b4fe101e5e609f3f24ec471a35a7e0e96a416834)\n" }, { "commit": "eda171cffa76e3fbfd5d7da9db738d9d1da07104", "tree": "0381252a47bc58aff66c1c14b099914131ce6466", "parents": [ "5ccf55eb8ab4894e61dbe117f5ea193cf4117dc3" ], "author": { "name": "Julia Reynolds", "email": "juliacr@google.com", "time": "Wed Jun 16 14:00:23 2021 -0400" }, "committer": { "name": "Yuri Lin", "email": "yurilin@google.com", "time": "Thu Jul 07 15:50:29 2022 +0000" }, "message": "Store DND rule owners\n\nTest: uiservicestest, cts\nBug: 189332346\nBug: 235823407\n\nChange-Id: Ie546c15c25fcbd193b67cb997220f075691e9bab\nMerged-In: Ie546c15c25fcbd193b67cb997220f075691e9bab\n" }, { "commit": "ca9d475ba4f6dfc44540165923eea2f1316c55ed", "tree": "76795062262e443a3b6b5b103f84e6f5728ff717", "parents": [ "6c68f5019fb41dcab46d44e90b12c6e54651b1ab", "2c12354e77976e17a6b1787e839ea09373058401" ], "author": { "name": "Manjeet Rulhania", "email": "mrulhania@google.com", "time": "Wed Jul 06 22:58:18 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 06 22:58:18 2022 +0000" }, "message": "Merge \"Remove package name from SafetyNet logs\" into qt-dev am: 2c12354e77\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19138582\n\nChange-Id: I7a24c7dfcb26195913cb36f1f8bc118844953891\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2c12354e77976e17a6b1787e839ea09373058401", "tree": "7601d4016b950d89aa9e0da31a64255f818b3dfb", "parents": [ "5ccf55eb8ab4894e61dbe117f5ea193cf4117dc3", "50d343c656921ba9c730c68b7a41de6b15f57f03" ], "author": { "name": "Manjeet Rulhania", "email": "mrulhania@google.com", "time": "Wed Jul 06 22:32:27 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jul 06 22:32:27 2022 +0000" }, "message": "Merge \"Remove package name from SafetyNet logs\" into qt-dev" }, { "commit": "6c68f5019fb41dcab46d44e90b12c6e54651b1ab", "tree": "efcb2f44734d5756e1da53bea579c64f5b1c8332", "parents": [ "2b5f7f71c339fb61f9b4c54d104433fb631b35bd", "5ccf55eb8ab4894e61dbe117f5ea193cf4117dc3" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 01 18:28:04 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 01 18:28:04 2022 +0000" }, "message": "Merge \"IMMS: Make IMMS PendingIntents immutable\" into qt-dev am: 5ccf55eb8a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19119301\n\nChange-Id: I6489df9d2f15ab52752fd26990d6f1dc24dbc0fb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "5ccf55eb8ab4894e61dbe117f5ea193cf4117dc3", "tree": "6a6b7f4f7ac60a72b702c0978eb5ad06dedb479f", "parents": [ "b5c79e141a81fa86fc834980d46886ac3c86ab11", "2b859826165bddb11f17b217d097253c442f6045" ], "author": { "name": "TreeHugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Jul 01 18:13:46 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 01 18:13:46 2022 +0000" }, "message": "Merge \"IMMS: Make IMMS PendingIntents immutable\" into qt-dev" }, { "commit": "2b5f7f71c339fb61f9b4c54d104433fb631b35bd", "tree": "ccb5ff0cb3bfdf1b3747c61dabee08860ec677a3", "parents": [ "78bdbdd22e98a3192215da0d29cbf4e88790c9d7", "b5c79e141a81fa86fc834980d46886ac3c86ab11" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Fri Jul 01 17:54:27 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 01 17:54:27 2022 +0000" }, "message": "Parcel: recycle recycles am: b5c79e141a\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19101007\n\nChange-Id: Ibd1008515a0d4bc9b919ef13a563de502c332c12\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "50d343c656921ba9c730c68b7a41de6b15f57f03", "tree": "f0c3e89afc7dff43d4684107302c8e7591072e8d", "parents": [ "63257e0e9780ba5b73e772c2a066095b69c22ac8" ], "author": { "name": "Manjeet Rulhania", "email": "mrulhania@google.com", "time": "Thu Jun 30 18:52:50 2022 +0000" }, "committer": { "name": "Manjeet Rulhania", "email": "mrulhania@google.com", "time": "Thu Jun 30 22:33:55 2022 +0000" }, "message": "Remove package name from SafetyNet logs\n\nBug: 213323615\nTest: AppSecurityTests\nChange-Id: Ia2be2b1e32dc0b75c352bc15219f4c4de9abb45a\nMerged-In: I993832e148636f1795ffe393c6dc74a08b9442f8\nMerged-In: I8f823487ca16861a35135cfc3383fa2ce8258017\nMerged-In: I4b61d13256ce0bfb8fc9d21db52ee78ce2097f14\n" }, { "commit": "84b1160cfc382f86af57f50d27864276d6c93f4a", "tree": "aaad6fd394b9348615c2f1c641a8004b1f8ced4a", "parents": [ "248bbf2dca0b94db3666bd0d6326102ff7208ffb" ], "author": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Wed May 11 22:15:21 2022 +0000" }, "committer": { "name": "Ganesh Olekar", "email": "olekarg@google.com", "time": "Thu Jun 30 00:40:15 2022 +0000" }, "message": "DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q\n\nTest: Manually install app apks targeting Q and verifying that AR permission is not auto-granted\nTest: atest ActivityRecognitionPermissionTest\nBug: 210065877\nChange-Id: I90adf45a6611ab8bc953765c72af77a6a4f7aae8\n" }, { "commit": "2b859826165bddb11f17b217d097253c442f6045", "tree": "45a47e8f685c0612695227bf553eed2ed13853e1", "parents": [ "63257e0e9780ba5b73e772c2a066095b69c22ac8" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Thu Sep 24 15:30:46 2020 +0200" }, "committer": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Jun 29 17:33:52 2022 +0000" }, "message": "IMMS: Make IMMS PendingIntents immutable\n\nFixes: 154913391\nTest: n/a\nChange-Id: I34a95732ef3e7c20d6549b57230c11f0c3db04d6\nMerged-In: I34a95732ef3e7c20d6549b57230c11f0c3db04d6\n(cherry picked from commit d4b625994f7664666ac7b53bf6a7d79a6459b3f1)\n(cherry picked from commit 6842f03c9d2f128785df5ce2bd02c61f35226554)\n" }, { "commit": "78bdbdd22e98a3192215da0d29cbf4e88790c9d7", "tree": "3eb983abe2b35fe4d080b2444c8961dba54a48d0", "parents": [ "269e4e0e32f1240c02426f55e655b26e4cf1cf8e", "63257e0e9780ba5b73e772c2a066095b69c22ac8" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Wed Jun 29 01:12:56 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 01:12:56 2022 +0000" }, "message": "Merge changes from topic \"revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO\" into qt-dev am: 63257e0e97\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695\n\nChange-Id: I831a7c6e8971d8998bb48326ef890c23dd8a97ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "269e4e0e32f1240c02426f55e655b26e4cf1cf8e", "tree": "3eb983abe2b35fe4d080b2444c8961dba54a48d0", "parents": [ "318cccd37de1894b7f6e9f3fee74425e0db0a703", "dde06fe41d59d7106c604fc848d46be3d17d2942" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Wed Jun 29 01:12:54 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 01:12:54 2022 +0000" }, "message": "[automerger skipped] [RESTRICT AUTOMERGE] Revert \"Revert \"Revert \"[pm] remove old stage dirs on low storage\"\"\" am: dde06fe41d -s ours\n\nam skip reason: skipped by user schfan\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092695\n\nChange-Id: I3750cf18bd2049c430dcf292cc19db365f3fc26f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "318cccd37de1894b7f6e9f3fee74425e0db0a703", "tree": "3eb983abe2b35fe4d080b2444c8961dba54a48d0", "parents": [ "9a00a3d2a86c13bb8ed4da414f7d230b14dad3a9", "650eb0cc65fe64af5c7dc234f75179f90ca62bed" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Wed Jun 29 01:12:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 01:12:42 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Revert \"Persist destroyed staged sessions until they are cleaned up\"\" into qt-dev am: 650eb0cc65\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213\n\nChange-Id: I7486e3d5668248c54a0ab6160c8112ef154903f0\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "9a00a3d2a86c13bb8ed4da414f7d230b14dad3a9", "tree": "3eb983abe2b35fe4d080b2444c8961dba54a48d0", "parents": [ "3a2171f668ec48a26dc1d1a07d4ae9cfc3fe466a", "07d74c4c28d622b65085a602f42793fda1791401" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Wed Jun 29 01:12:25 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 29 01:12:25 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Revert \"Persist destroyed staged sessions until they are cleaned up\" am: 07d74c4c28\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19092213\n\nChange-Id: If22465789761ee4d6077a84b5d570f4392fedbb2\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b5c79e141a81fa86fc834980d46886ac3c86ab11", "tree": "4341285aee4807b5277cf9d4e100cd929e28a5c5", "parents": [ "63257e0e9780ba5b73e772c2a066095b69c22ac8" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Wed Mar 30 21:46:29 2022 +0000" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Jun 28 23:11:34 2022 +0000" }, "message": "Parcel: recycle recycles\n\nBefore, it was like getting a used pan with food stuck on it. We run\na clean ship here. You want a Parcel? You get a fresh Parcel. When\nwe recycle a Parcel, we do a real clean-up job. Air freshener. All\nbits brushed over. These Parcel objects are clean as heck now!\n\n(specifically cleans mClassCookies)\n\nBug: 208279300\nTest: build\nMerged-In: I250872f5c6796bb64e2dc68008154c0e90feb218\nChange-Id: I250872f5c6796bb64e2dc68008154c0e90feb218\n(cherry picked from commit 46770fa49c9a5e51a5ea5a3afc7aab0dba2e59bd)\n" }, { "commit": "63257e0e9780ba5b73e772c2a066095b69c22ac8", "tree": "e86df464b7cdaef1c24bdf42226da2cc68bc2bb9", "parents": [ "650eb0cc65fe64af5c7dc234f75179f90ca62bed", "dde06fe41d59d7106c604fc848d46be3d17d2942" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 20:37:57 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 28 20:37:57 2022 +0000" }, "message": "Merge changes from topic \"revert-16575908-dont_abandon_child_qt_dev-VVMFNIYZZO\" into qt-dev\n\n* changes:\n [RESTRICT AUTOMERGE] Revert \"Revert \"Revert \"[pm] remove old stage dirs on low storage\"\"\"\n [RESTRICT AUTOMERGE] Revert \"Don\u0027t abandon child sessions (1/n)\"\n [RESTRICT AUTOMERGE] Revert \"Fix NPE\"\n" }, { "commit": "650eb0cc65fe64af5c7dc234f75179f90ca62bed", "tree": "7fdce8980b8eafa1364f43f93a12b77a9d8afef4", "parents": [ "a4924eb85c78f5a75e3b431c5529eeddc67dc2ca", "07d74c4c28d622b65085a602f42793fda1791401" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 20:37:57 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jun 28 20:37:57 2022 +0000" }, "message": "Merge \"[RESTRICT AUTOMERGE] Revert \"Persist destroyed staged sessions until they are cleaned up\"\" into qt-dev" }, { "commit": "dde06fe41d59d7106c604fc848d46be3d17d2942", "tree": "ccd5ae34c4252bb99c41996b82a3246b524ae95b", "parents": [ "6b86ed849780dedd0f9319833e53bb194d74fefa" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 01:08:51 2022 +0000" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 16:42:29 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Revert \"Revert \"Revert \"[pm] remove old stage dirs on low storage\"\"\"\n\nThis reverts commit 3e28df68fa23add99c84507bdcd9f0270311f1fc.\n\nReason for revert: Reverting CVE-2021-39624 on qt-dev\n\nChange-Id: I26c0abd06e2a49e05f45d153c4247f7c0a269897\n" }, { "commit": "6b86ed849780dedd0f9319833e53bb194d74fefa", "tree": "1b2fdb510f28ea449d125c1e37f5332b28b2bf61", "parents": [ "a4945fcf4b29e6728ce8bae3970f42a75898d0e2" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 01:08:02 2022 +0000" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 16:42:17 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Revert \"Don\u0027t abandon child sessions (1/n)\"\n\nRevert submission 16575908-dont_abandon_child_qt_dev\n\nReason for revert: Reverting CVE-2021-39624 on qt-dev\nReverted Changes:\nI4ede6b7a4:Persist destroyed staged sessions until they are c...\nIb0ba9f378:Don\u0027t abandon child sessions (1/n)\n\nChange-Id: I7915e3f0ba6dd8430a9b938a518aeeeb4d6b1805\n" }, { "commit": "07d74c4c28d622b65085a602f42793fda1791401", "tree": "98c832aa03a5033ab7f7769bea247b1efa0925a0", "parents": [ "30348d5cdca5aac192102ce4ac5a7d5fa01d0c04" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 01:08:02 2022 +0000" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 16:37:33 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Revert \"Persist destroyed staged sessions until they are cleaned up\"\n\nRevert submission 16575908-dont_abandon_child_qt_dev\n\nReason for revert: Reverting CVE-2021-39624 on qt-dev\nReverted Changes:\nI4ede6b7a4:Persist destroyed staged sessions until they are c...\nIb0ba9f378:Don\u0027t abandon child sessions (1/n)\n\nChange-Id: I50ab96061b2e0fa016a0fbdb5773ccc5f2397ac6\n" }, { "commit": "a4945fcf4b29e6728ce8bae3970f42a75898d0e2", "tree": "bc12e5ed207e7b51ca1da07812d7839a29e491ad", "parents": [ "f562aadd77298ec019dc410e395a512bbb57c720" ], "author": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 01:06:53 2022 +0000" }, "committer": { "name": "Songchun Fan", "email": "schfan@google.com", "time": "Tue Jun 28 16:37:14 2022 +0000" }, "message": "[RESTRICT AUTOMERGE] Revert \"Fix NPE\"\n\nThis reverts commit f562aadd77298ec019dc410e395a512bbb57c720.\n\nReason for revert: Reverting CVE-2021-39624 on qt-dev\n\nChange-Id: Ida84f497eb188b4923acbe8acdbe4d47427aa24e\n" }, { "commit": "3a2171f668ec48a26dc1d1a07d4ae9cfc3fe466a", "tree": "389161582dc5da0546d58822e9477b8bea9a9ffc", "parents": [ "822fbf618b5fcfd5caee63974b264b1ec4136d4d", "a4924eb85c78f5a75e3b431c5529eeddc67dc2ca" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Tue Jun 14 22:57:41 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 14 22:57:41 2022 +0000" }, "message": "Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b am: a4924eb85c\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703\n\nChange-Id: Ia735cd97a591faa63c344958b41e7c4feb7f2a89\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a4924eb85c78f5a75e3b431c5529eeddc67dc2ca", "tree": "306c98734fbe23c9b65bf4dbf4add10e708740cb", "parents": [ "99ccb4e5b0c05d650ad4df05f947781f16cf7fc9", "4220de4d5b19362858d4dcf6ce302be78c60a9f8" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Tue Jun 14 22:31:58 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Jun 14 22:31:58 2022 +0000" }, "message": "Ignore tests in RecoverableKeyStoreManagerTest am: 4220de4d5b\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18720703\n\nChange-Id: I837accdc0d4f5bada34fe8da18075092dd295801\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "822fbf618b5fcfd5caee63974b264b1ec4136d4d", "tree": "ee0fe45ba2975fd17b01496ead3684f86795276a", "parents": [ "c2d5e2cb81bd38c9e3a1a293f48bcf8a59ed5859", "99ccb4e5b0c05d650ad4df05f947781f16cf7fc9" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jun 08 19:20:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 08 19:20:45 2022 +0000" }, "message": "Merge \"Only allow the system server to connect to sync adapters\" into qt-dev am: 99ccb4e5b0\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18701369\n\nChange-Id: Ie919bc05747a1009507a29de429c3e8d043fed9d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "99ccb4e5b0c05d650ad4df05f947781f16cf7fc9", "tree": "dabd6f820c1f5943a3041f35bfee6d7658ae36cc", "parents": [ "fa1fc20874cc1cb4a18f2cbfa6ad8be3ea3b1b57", "7d1397a54475ed7fee632339ef7c60b432f0fbff" ], "author": { "name": "Makoto Onuki", "email": "omakoto@google.com", "time": "Wed Jun 08 18:56:23 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 08 18:56:23 2022 +0000" }, "message": "Merge \"Only allow the system server to connect to sync adapters\" into qt-dev" }, { "commit": "c2d5e2cb81bd38c9e3a1a293f48bcf8a59ed5859", "tree": "8d9f47e773a45a81e88e0405cd4c9c06c1baa298", "parents": [ "dadbab8ae8a19bf8b38629515dc85cdbdaa85752", "fa1fc20874cc1cb4a18f2cbfa6ad8be3ea3b1b57" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Jun 08 07:40:15 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 08 07:40:15 2022 +0000" }, "message": "Merge \"Restrict getInputMethodWindowVisibleHeight\" into qt-dev am: fa1fc20874\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968\n\nChange-Id: Ia6115784eb97b7759750acca4f271772f8a59ba8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "fa1fc20874cc1cb4a18f2cbfa6ad8be3ea3b1b57", "tree": "244758ed4edff987a0d7e4e9f06e35cb9f709c0d", "parents": [ "3ac8d1dc2f82f1715ef7ec19d1466a340eb645b8", "094ea03f14fea46161e7e5ac7b9f8a9c5d7c1ce3" ], "author": { "name": "Adrian Roos", "email": "roosa@google.com", "time": "Wed Jun 08 07:21:26 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 08 07:21:26 2022 +0000" }, "message": "Merge \"Restrict getInputMethodWindowVisibleHeight\" into qt-dev" }, { "commit": "dadbab8ae8a19bf8b38629515dc85cdbdaa85752", "tree": "ef782169951180640deba4d056c0cee4f71a19d9", "parents": [ "c1b4cacc6611bac252a4733e15f3eb3dd775519e", "3ac8d1dc2f82f1715ef7ec19d1466a340eb645b8" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Jun 08 01:58:13 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jun 08 01:58:13 2022 +0000" }, "message": "Merge \"Stop using invalid URL to prevent unexpected crash\" into qt-dev am: 3ac8d1dc2f\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18715266\n\nChange-Id: Ia7d1ef07c32c791d71c7bd4561641620aaa66de1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ac8d1dc2f82f1715ef7ec19d1466a340eb645b8", "tree": "a6a8ddbb7e97336da45c6d2dcb75ce2b8d6e98eb", "parents": [ "51d47ec7c875cf964f46965a27a5d36343ea999d", "6d6f4106948bbad67b9845603392d084078997c4" ], "author": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Wed Jun 08 01:30:34 2022 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 08 01:30:34 2022 +0000" }, "message": "Merge \"Stop using invalid URL to prevent unexpected crash\" into qt-dev" }, { "commit": "6d6f4106948bbad67b9845603392d084078997c4", "tree": "2004ab29c2ecd4f92e69a38de768b4f3f6670a45", "parents": [ "38fe45b539e8a11f63c1dbf7715a44144a3cfab9" ], "author": { "name": "chiachangwang", "email": "chiachangwang@google.com", "time": "Thu Jun 02 10:22:20 2022 +0000" }, "committer": { "name": "Chiachang Wang", "email": "chiachangwang@google.com", "time": "Mon Jun 06 02:03:41 2022 +0000" }, "message": "Stop using invalid URL to prevent unexpected crash\n\nVerify the input PAC Uri before performing follow-up actions.\n\nCheck if the URL is a valid URL to filter some invalid URLs since\nthese invalid URLs could not fall into any subclass of existing\nURLConnections. When the PAC Uri is other invalid URL scheme, it\nwill cause an UnsupportedOperationException if there is no proper\nsubclass that implements the openConnection() method.\nA malformed URL may crash the system.\n\nEven it\u0027s a valid URL, some subclasses(e.g. JarURLConnection)\nmay not have openConnection() implemented. It will also hit the\nproblem, so convert the possbile exception from openConnection()\nto re-throw it to IOException which is handled in the existing\ncode.\n\nBug: 219498290\nTest: atest FrameworksNetTests CtsNetTestCases\nTest: Test with malformed URL\nMerged-In: I22903414380b62051f514e43b93af992f45740b4\nMerged-In: I2abff75ec59a17628ef006aad348c53fadbed076\nChange-Id: I4d6cec1da9cf3f70dec0dcf4223254d3da4f30a3\n(cherry picked from commit 6390b37a3b32fc7583154d53fda3af8fbd95f59f)\n" }, { "commit": "c1b4cacc6611bac252a4733e15f3eb3dd775519e", "tree": "402315229c7f8e2e0e8226cfa5f42a6dbff6c384", "parents": [ "8bb5e98ecbb90357690ee5eaf9dcf0e0e703118b", "51d47ec7c875cf964f46965a27a5d36343ea999d" ], "author": { "name": "Raphael Kim", "email": "raphk@google.com", "time": "Sun Jun 05 02:14:42 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sun Jun 05 02:14:42 2022 +0000" }, "message": "Remove package title from notification access confirmation intent am: 51d47ec7c8\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670434\n\nChange-Id: I4fb8082b1f94c628417c41fd6bd6d1fd4906a12e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4220de4d5b19362858d4dcf6ce302be78c60a9f8", "tree": "b196c63a4ee1ea3531a27e7f6bdcced883efd2a5", "parents": [ "5e2939bd2109ec0991d504e2f13e534b7c2b516b" ], "author": { "name": "Kenneth Ford", "email": "kennethford@google.com", "time": "Fri May 06 22:47:56 2022 +0000" }, "committer": { "name": "Dmitry Dementyev", "email": "dementyev@google.com", "time": "Thu Jun 02 22:21:05 2022 +0000" }, "message": "Ignore tests in RecoverableKeyStoreManagerTest\n\nIgnores unit tests that were causing a Droidmonitor breakage.\n\nBug: 231667368\nTest: N/A\nChange-Id: I719312475264e8099edb607a941468c1c5ecb1a5\n(cherry picked from commit 8721d110fdf34b6ebc6b0e70cf4fa439cba1e2d5)\n" } ], "next": "51d47ec7c875cf964f46965a27a5d36343ea999d" }