- Mar 08, 2023
-
-
Jeff Chen authored
Merge "Add @Platinum and @Ignore to DemotingTestWithoutBugDetector linter." into tm-qpr-dev am: 7261d756 am: 16758a87 am: 250be6cb am: 67e09331 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779360 Change-Id: I33b42cfbd13eeeb245c6f5c755a516610d74ab4c Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Diego Vela authored
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5 am: 5ce988eb -s ours am: 145983ac -s ours am: bb5a3054 -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21893030 Change-Id: I48cc488d50213e3c81641f0481a01416b8a02584 Signed-off-by:
-
Reema Bajwa authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21530993 Change-Id: I3ec817b2cda10c76c31aa395f60828f87d01179f Signed-off-by:
-
Zi Wang authored
[automerger skipped] Merge "Add java_genrule to replace handcrafted api fingerprint generation" am: cfa332fb am: 8b949b56 am: f6874c76 -s ours am: 2dbab100 -s ours am: aaff8bc0 -s ours am skip reason: Merged-In Ib58f736ce43d877d0c08cdd9b154e93a1766105b with SHA-1 9a26363f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464456 Change-Id: I02a7ae5aa9f7e4b817904e54f4150ef6f195ae38 Signed-off-by:
-
Chloe Dai authored
[automerger skipped] Merge "Fix the feature flag mis-checking cause exception issue" am: a78c7e67 am: aa09426e am: bf1d8a9e -s ours am: 63a72cdb -s ours am: 0b673089 -s ours am skip reason: Merged-In Ibdacf947dcfc9e57015a03e38b836745b7353713 with SHA-1 0b1be85e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2424965 Change-Id: I1d7586fbce2478b799441076706381a2c0f4bcd2 Signed-off-by:
-
Jeff Chen authored
Merge "Add @Platinum and @Ignore to DemotingTestWithoutBugDetector linter." into tm-qpr-dev am: 7261d756 am: 16758a87 am: 250be6cb am: 87e3a401 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779360 Change-Id: I71747fc323fac7cb14928e9409a0fb6f3e6889f1 Signed-off-by:
-
Diego Vela authored
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5 am: 5ce988eb -s ours am: 145983ac -s ours am: eb86f930 -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21893030 Change-Id: Ifd8a0981ff8e3b202ccff8340192392fa28eb3ed Signed-off-by:
-
Tracy Zhou authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21847213 Change-Id: If6af7bbbd5f757628f79d9ae4077ac1dc1d96fd3 Signed-off-by:
-
Tiger Huang authored
Merge "Use the new way to create source ID from InsetsFrameProvider" into udc-dev am: d2be400f am: 12096ac4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21557699 Change-Id: I82922db3790b16bf1f1e7e0a5450b982722b5889 Signed-off-by:
-
Reema Bajwa authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21530993 Change-Id: Id78a094ca5fe82ee2adc0c1712a1655112a37ea9 Signed-off-by:
-
Zi Wang authored
[automerger skipped] Merge "Add java_genrule to replace handcrafted api fingerprint generation" am: cfa332fb am: 8b949b56 am: f6874c76 -s ours am: 2dbab100 -s ours am skip reason: Merged-In Ib58f736ce43d877d0c08cdd9b154e93a1766105b with SHA-1 9a26363f is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2464456 Change-Id: I7d76389e14782664d9e5814b8cfb0a2798793bbf Signed-off-by:
-
Tracy Zhou authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21847213 Change-Id: I8545b2787cc05a8c116c96c6e9cc078a19fe9097 Signed-off-by:
-
Chloe Dai authored
[automerger skipped] Merge "Fix the feature flag mis-checking cause exception issue" am: a78c7e67 am: aa09426e am: bf1d8a9e -s ours am: 63a72cdb -s ours am skip reason: Merged-In Ibdacf947dcfc9e57015a03e38b836745b7353713 with SHA-1 0b1be85e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2424965 Change-Id: Ia96ba002487a2877043982e09e36a31c5bf4f60d Signed-off-by:
-
Jeff Chen authored
Merge "Add @Platinum and @Ignore to DemotingTestWithoutBugDetector linter." into tm-qpr-dev am: 7261d756 am: 16758a87 am: 250be6cb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779360 Change-Id: Id5c538a9468be2034e98f2d11e976def18664493 Signed-off-by:
-
Jeff Chen authored
Merge "Add @Platinum and @Ignore to DemotingTestWithoutBugDetector linter." into tm-qpr-dev am: 7261d756 am: 16758a87 am: 250be6cb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21779360 Change-Id: Ie75cf1a9f553f77758d5a6a957b9c9f14d7d8953 Signed-off-by:
-
Diego Vela authored
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5 am: 5ce988eb -s ours am: 145983ac -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21893030 Change-Id: Ib7d69b512eea96ed6cb215679da477f0199f2738 Signed-off-by:
-
Diego Vela authored
[automerger skipped] Merge "Revert "Fix vulnerability in AttributionSource due to incorrect ..."" into tm-dev am: bc41a652 am: 0e408f94 am: 3ab864b5 am: 5ce988eb -s ours am: 145983ac -s ours am skip reason: Merged-In Ic301a8518b8e57e1c9a2c9f2f845e51dca145257 with SHA-1 922e52bc is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21893030 Change-Id: Ib590a205a7c9592ed4505c85d076f4e260702aff Signed-off-by:
-
Tiger Huang authored
Merge "Use the new way to create source ID from InsetsFrameProvider" into udc-dev am: d2be400f am: 87d9053a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21557699 Change-Id: I69b49b7928e5127d8ce51051775f3ce6f334e7d8 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Add permissions for default AOSP wallpaper picker app" into tm-qpr-dev am: 11570b9d am: 59d9caa5 am: 836354c5 am: 757ab6b3"
-
Santiago Etchebehere authored
Merge "Add permissions for default AOSP wallpaper picker app" into tm-qpr-dev am: 11570b9d am: 59d9caa5 am: 836354c5 am: 9818ca6f Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21546145 Change-Id: I20ca4d4ed54369e9ffd18bcd85407093cb891a9f Signed-off-by:
-
Santiago Etchebehere authored
Merge "Add permissions for default AOSP wallpaper picker app" into tm-qpr-dev am: 11570b9d am: 59d9caa5 am: 836354c5 am: 757ab6b3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21546145 Change-Id: I55d8e2ea95279f5f5d9fd9cf874b00ac31e18b41 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Fix RegionSampler crashes" into tm-qpr-dev am: 63afdb25 am: ca3c7f2d am: 82cacb96 am: 417b1143"
-
Florence Yang authored
Merge "Fix RegionSampler crashes" into tm-qpr-dev am: 63afdb25 am: ca3c7f2d am: 82cacb96 am: 417b1143 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21733197 Change-Id: Ib9f514877bcb348599108c410d7fc270e6e6be49 Signed-off-by:
-
Florence Yang authored
Merge "Fix RegionSampler crashes" into tm-qpr-dev am: 63afdb25 am: ca3c7f2d am: 82cacb96 am: 47a8bf19 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21733197 Change-Id: I9486cde3dd2e21916dea38e901d98a58ddaa1529 Signed-off-by:
-
-
Daniel Norman authored
Merge "Adds accessibility team to OWNERS for AccessibilityInteractionControllerTest" am: 73de090f am: e0402386 am: 76ebd494 am: f94b7ce5 am: 16fe0a2f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2473664 Change-Id: I4ce53a2db71ed9e34dd4c1ded47d0c6b73267676 Signed-off-by:
-
Daniel Norman authored
Merge "Adds accessibility team to OWNERS for AccessibilityInteractionControllerTest" am: 73de090f am: e0402386 am: 76ebd494 am: f94b7ce5 am: e2c25fe0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2473664 Change-Id: Id1045f2d073d12ad1d85606dea6ba807819ea548 Signed-off-by:
-
Dave Mankoff authored
Merge "Delay restarting SystemUI on debug builds." into tm-qpr-dev am: abc951df am: a5b0c6c7 am: 35426ea4 am: 14ec56cb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21751049 Change-Id: I8f67de58e5f7225832a7e4ff533b910b72a05317 Signed-off-by:
-
Dave Mankoff authored
Merge "Delay restarting SystemUI on debug builds." into tm-qpr-dev am: abc951df am: a5b0c6c7 am: 35426ea4 am: bf556289 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21751049 Change-Id: I000c281ab6c546dd98ff13ad1935b4e7937db9c8 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5 am: 46555d7f" into udc-dev am: 1125a000 am: 7faa569a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21810538 Change-Id: Ibab0ab92cdca4671064a5756d81966c5d04c7feb Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5 am: 46555d7f" into udc-dev am: 1125a000 am: c09e7344"
-
Automerger Merge Worker authored
Merge "Merge "Fix resumable session players" into tm-qpr-dev am: 9b204ac5 am: 46555d7f" into udc-dev am: 1125a000 am: c09e7344 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21810538 Change-Id: I9de0a43e39464ee84926b3a325f952d70f4a2789 Signed-off-by:
-
Reema Bajwa authored
-
Wei Sheng Shih authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21794181 Change-Id: I908a78935faf675c2ad92cb7072491f98519510d Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Revert^2 "Introduce Windowless starting window."" into udc-dev am: 0b2aa295 am: 2e086486"
-
Wei Sheng Shih authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21794181 Change-Id: Iccb651a85618e4f0e035b60f452e8c1989953d64 Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS" into tm-qpr-dev-plus-aosp am: b55ddcc9 -s ours am: a2714fc5 -s ours am: 34ed1780 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21757719 Change-Id: I7a81619d6229f7f53f599a12fae17cd4da1bc5d3 Signed-off-by:
-
Julia Reynolds authored
[automerger skipped] DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS am: 4de5d6dc -s ours am: 32414391 -s ours am: e407324d -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21757719 Change-Id: I1595d71b3f8c2dfaac23517b23025e469f027e59 Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS" into tm-qpr-dev-plus-aosp am: b55ddcc9 -s ours am: a2714fc5 -s ours am: 8bbf7f68 -s ours [automerger skipped] DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS am: 4de5d6dc -s ours am: 32414391 -s ours am: 13775896 -s ours
-
Julia Reynolds authored
[automerger skipped] Merge "DO NOT MERGE FLAG_FOREGROUND_SERVICE requires a running FGS" into tm-qpr-dev-plus-aosp am: b55ddcc9 -s ours am: a2714fc5 -s ours am: 8bbf7f68 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21757719 Change-Id: Ib4e20af875eb14ad762e6bef92635c22d4787cb7 Signed-off-by:
-
