- Oct 16, 2023
-
-
Tri Vo authored
Merge "docs: Clarify when certificate is self-signed" into main am: 69bbd1c8 am: 76ee8400 am: a14b6b88 am: 8aa17221 am: 2b33511f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779947 Change-Id: I66f1abef486c7bef3356e6adbc1acbc8897dfd25 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Thomas Nguyen authored
-
Coco Duan authored
-
Tri Vo authored
Merge "docs: Clarify when certificate is self-signed" into main am: 69bbd1c8 am: 76ee8400 am: a14b6b88 am: 8aa17221 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779947 Change-Id: I974dcf5a9c78343be94549a7913004eed16e2a14 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
[automerger skipped] Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-qpr-dev am: 2d606637 am: 94ef1785 -s ours am skip reason: Merged-In I24f0eafb2479ac7427ba28077e45ba26a9127cc8 with SHA-1 f509803c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761638 Change-Id: I66e6ac3292fc7d2046775af7bec2d6bd65df4ae1 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Winson Chung authored
Merge "Allow mixed handler to handle transitions that might enter PIP" into udc-qpr-dev am: fd740934 am: 6da008d5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25039491 Change-Id: I9cac3a693894f67e694ceca68902ecc7157a614e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
[automerger skipped] Merge "Clean up ANGLE integration logic." into main am: 37679589 am: c45e177e am: 02ed0eea am: 003977d0 -s ours am: dcf8d52b -s ours am skip reason: Merged-In I2d398a36e0320b16de8664909ceb024089128aad with SHA-1 a6b1efb3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787038 Change-Id: I16e7f11bc2bd8e20f4c0fff4ac878e29b0fdc0c0 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Tri Vo authored
Merge "docs: Clarify when certificate is self-signed" into main am: 69bbd1c8 am: 76ee8400 am: a14b6b88 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779947 Change-Id: Ia21b574776ec7475e6c54f66283e56706aa52704 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Varun Shah authored
-
Song Chun Fan authored
-
Treehugger Robot authored
Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-qpr-dev am: 2d606637 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24761638 Change-Id: I49803b3eeb279940083858460106b2a234bbe3de Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Winson Chung authored
Merge "Allow mixed handler to handle transitions that might enter PIP" into udc-qpr-dev am: fd740934 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25039491 Change-Id: I4833b30572b7a27a7719bf6166ba9768afc3ffe6 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
[automerger skipped] Merge "omapi(interface): Make it available for nfc apex" into main am: cad3cea1 am: 02070b6d am: bf87d405 am: fa22fef9 am: 8734635d -s ours am skip reason: Merged-In Ife7098e0619b17c1f1ed3b276592207d09cdb6ea with SHA-1 5b2ce407 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244 Change-Id: Id8997773a4d7e6b7057571199a8bb310c44cb123 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
[automerger skipped] Merge "Clean up ANGLE integration logic." into main am: 37679589 am: c45e177e am: 02ed0eea am: 003977d0 -s ours am skip reason: Merged-In I2d398a36e0320b16de8664909ceb024089128aad with SHA-1 a6b1efb3 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787038 Change-Id: I56d6f732438f3179ba21539bed5331100be18c2e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Merge "omapi(interface): Make it available for nfc apex" into main am: cad3cea1 am: 02070b6d am: bf87d405 am: fa22fef9 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244 Change-Id: Ie24297639a23d9f3fe6a6f1319633ea503cfae2b Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Tri Vo authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779947 Change-Id: Ie7e0bbd8f927dbed233a21dd4426c66454782896 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Ang Li authored
-
Treehugger Robot authored
Merge "fix(magnifier): avoid crash when smashing magnifier shortcut button repeatedly" into udc-qpr-dev
-
Robert Wu authored
-
Winson Chung authored
-
Winson Chung authored
- The split transitions currently don't handle this case properly when an adjacent task is launched triggering a split task to enter PIP. Fixes: 303755768 Test: Split YT & Gmail, click link from Gmail Test: http://recall/-/g6hkB0pXjyQSvfA8STqRAT/hrdzWmMHFGHJKaSyLxb8yh Change-Id: I390ded4075211c8b5c0d328dcda42d189bee1fa8
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787038 Change-Id: I26852014defb21516253a39d4293d69c383ebea9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Juan Sebastian Martinez authored
-
Roshan Pius authored
Merge "omapi(interface): Make it available for nfc apex" into main am: cad3cea1 am: 02070b6d am: bf87d405 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244 Change-Id: I67599a99dc86e101b208e9e1b0b9bef81d3992da Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Tri Vo authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779947 Change-Id: I58d2a525f929436b2a81b3f08a64eabb68f78ba0 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Makoto Onuki authored
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787038 Change-Id: I3a0b161d502da01fdf784aa1a4a528b098e76ff6 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Chun-Ku Lin authored
-
Roshan Pius authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244 Change-Id: I02960f3ac5c97e70dd2fa55f4be0e014a7f79751 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Tri Vo authored
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2787038 Change-Id: I5b5007b55021776caa1422ced6c9cc1d19f6d6b9 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2773244 Change-Id: I1fbd81019f59cb990822a977ef797ed6865c4419 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Chavi Weingarten authored
-
Treehugger Robot authored
-
Xin Guan authored
Fall back to the previous behavior when the new REPORT_USAGE_STATS flag is default to ensure no app compact breakage. Bug: 305648037 Test: share a picture in photo, make sure no crash. atest CtsUsageStatsTest Change-Id: I3311ed93bc66cf749092b1add4cf6cba36ecfdd2
-
Jihoon Kang authored
Merge "Disable validations for full api surface stub java_api_library" into main am: 52cc77c3 am: a8a00dc8 am: 977eb9d3 am: ea24a657 am: ed89e903 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776687 Change-Id: I0185fdc64b05774e29b29a403f51b237a3688b2e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Roshan Pius authored
-
Jihoon Kang authored
Merge "Disable validations for full api surface stub java_api_library" into main am: 52cc77c3 am: a8a00dc8 am: 977eb9d3 am: ea24a657 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2776687 Change-Id: I2724b971f88ddedb4ffe994ed15415030d6a242d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Eric Biggers authored
Merge "Remove KeyStore#state()" into main am: 28dc9370 am: ac3cf1f7 am: 4154f307 am: 5d6cf975 am: 751ef205 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2768548 Change-Id: I34a6c05aae52e111e9e023aeb99f1cc7402a79f1 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Song Chun Fan authored
Merge "PM: Use installed userId while moving apps" into main am: d03e417b am: e24844ce am: 623d171d am: 280b30d1 am: 591e049f Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2764865 Change-Id: I051f21c5bb5c02f3c10f2bb442f17b7a7d6add1f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-