summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-05-26Merge cherrypicks of [18231932] into sparse-8563200-L30900000954800704.android-12.1.0_r8android12-qpr3-s2-releaseAndroid Build Coastguard Worker
Change-Id: I66a2238362c3fdfc748ffbb07694a0bb0d619734
2022-05-26DO NOT MERGE: Revert "RESTRICT AUTOMERGE: Polish IME transition from ↵Ming-Shin Lu
fullscree..." Revert submission 17397265-presubmit-am-5310c6a98b9041fa8e3d0cd9070573d2 Reason for revert: b/231594180 and b/231548400 for SC QPR3 Reverted Changes: If2c6d7bd6:[automerge] RESTRICT AUTOMERGE: Polish IME transit... I332c0e4ff:RESTRICT AUTOMERGE: Polish IME transition from ful... Change-Id: I24750ada98c954244fa9ee8f844ec92aa0494c86 (cherry picked from commit 20e8b225a069c52b8d7ef0f4402b2f379fb46ffb) Merged-In: I24750ada98c954244fa9ee8f844ec92aa0494c86
2022-04-22Merge cherrypicks of [17800234] into sc-qpr3-release.Android Build Coastguard Worker
Change-Id: I4bae0639b4dc3948f50aa794f00285ffb1b5604b
2022-04-22[DO NOT MERGE] Force extra nav bar provide side gesture insetsYunfan Chen
This is a patch to fix the missing gesture insets issue when there's a task bar and no navigation bar on the display. It will try to add the gesture navigation insets when a window providing navigation bar insets is added and there's no window with TYPE_NAVIGATION_BAR. The logic will only be applied when the insets is not flexible. Due to the removal of the old hard-coded logic in the later version, this patch should not be merged into the next version. Bug: 212643340 Test: android.widget.cts.SeekBarTest#testSetOnSeekBarChangeListener Change-Id: I080df3547361aef1aa259dd2b3dc9bdb860a0193 (cherry picked from commit 1921f8c1dc660851a499c5dac5a55cedf854f93e) Merged-In: I080df3547361aef1aa259dd2b3dc9bdb860a0193
2022-04-09Snap for 8426946 from d4cb37a7d3eca5c380a97d64b835f40fbf0bf18f to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I2ddcaddc839492e7f87d11faa6d7186fd7923e8a
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-07Snap for 8417597 from d4e7e2336adf8d10cdd9ab321be7933af6f05c1c to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I68d53bab704de257ebec2041841fe478bcd0b26c
2022-04-07Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Automerger Merge Worker
49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev
2022-04-07Merge "Fix issue where cold-start launching an activity from the shade while ↵TreeHugger Robot
an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Remi NGUYEN VAN
49f031ea4d am: 2f74509789 am: c14e995495 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: Ifb8d0d20243e35601011eedb9442594f24067fe0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Remi NGUYEN VAN
49f031ea4d am: 2f74509789 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: Ie1230d9ce9e590b6174ce9d28cc0106d0058b64a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4dRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ffRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal ↵Shawn Lin
res" into sc-v2-dev
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Icd89bfbe997fd18e8b8bfcddd5c198ad34d8d8c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Ie04277d055fb481438470087819c529a7392903b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requestedRemi NGUYEN VAN
MPPE cannot work if PAP is used as authentication, so it is not useful to allow PAP authentication when MPPE is enforced: establishing the tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not performed". Also users enforcing MPPE may assume that this means PAP will not be used for authentication, so without this change MPPE enforcement gives a false sense of security, as PAP uses plain-text credentials. Bug: 201660636 Test: atest VpnTest Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417 Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417 (cherry picked from commit 997a4a39268b4f3af7ccc388269b5eb1972d3624)
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I21dbbd1657b46707bfc166aaf0e15cbbcccc9df6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Id00e21bafa61a9174b85c68a461400a892d8c77d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I554fe339239a0581021bda208444f846d844a381 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I1fa066a66afc97a76304fef898b44a63dd5fb9d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie2f5ad43e3ac8487d54cd255b657da5627de44a8
2022-04-06Snap for 8412755 from 5cccc67c1efad87d5fe24d6fa535cb36f2b2a750 to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I884c706e98c693a5496ffeb15c7ad1229d5665a0
2022-04-06Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev
2022-04-06[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am: d716a26d58 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I99c991458aba3e9f1df9f2ccc111006568058acf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [rvc] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am: 3174a8bc5a -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I6925adb48b9b73a59d156396a9c82fedbe307c03 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Ibb2467d2beb1a7a46c6354382fc6108bb5457c7b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I8a2b23cc9d7258d47e468f780928a32a4503bde1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I68d2d553704f480eed2ef635c50ab0478d8e057f
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I6294b47efadd8814a049005cc733db60246c20c7
2022-04-06[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am: 7744c71e64 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I05dfde41e89e58a37c6c30453d339919d2ca4df4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [rvc] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am: b7248d037f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: Ifd5dd14df998cbd36d5a3c5d5d81aedf2e0543f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I0472617b5f7ee1dec086aee641339497b8630659 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I4c0aef4b20d7b473d5fa160b64f5e05131b2cd17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[rvc] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into rvc-dev am: f0b395138c am: 23c3740386 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I8217e2a43bae1be58ec76821f16b05f7fbf0bf43 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [rvc] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: bde28d286e am: 62de92b4ea -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17591530 Change-Id: I79744a8cbee16ade46d2f7eb0849b3c6fd41de6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I0501b2bfddaf5e666c6962b898d8698abbfa01de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Ie1052d196899df0aa598d0fe95b318a6cf737493 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 23:38:57 +0000