- Oct 16, 2023
-
-
Ayush Sharma authored
[automerger skipped] Merge "Handle error connecting to KeychainService" into udc-qpr-dev am: 64a1987b am: 409319a4 -s ours am skip reason: Merged-In If2f41aea48ac9284ad205debb878d633072431f4 with SHA-1 a93b4fdf is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25058689 Change-Id: I6965882594db0ecad76d9ac59be46a66996cb514 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main am: 8469d746 am: e1702d79 am: bdfd6681 am: bbe076b0 am: 683e85bb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784716 Change-Id: Ie6ebaa4290629e31899c3ca173a512e4a2a55ce2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Hunter Knepshield authored
Merge "Add BarringInfo.BarringServiceInfo#toString" into main am: 6f25c5b7 am: 4f154870 am: 70669dec am: 199266be am: f8a54ac5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779769 Change-Id: I806b96ee9e2716d2dae679743055162585175383 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 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
-
Ayush Sharma authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25058689 Change-Id: If4cfac19377ee96834cdb82d502a42a244484bab Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Coco Duan authored
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main am: 8469d746 am: e1702d79 am: bdfd6681 am: bbe076b0 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784716 Change-Id: Ie8129bdbbed09592ecc748c0d93d0802cb09da9f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Hunter Knepshield authored
Merge "Add BarringInfo.BarringServiceInfo#toString" into main am: 6f25c5b7 am: 4f154870 am: 70669dec am: 199266be Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779769 Change-Id: Iba8500c9c6e5cad5e72ee9385f86439d208191ce 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 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>
-
Ayush Sharma authored
-
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>
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main am: 8469d746 am: e1702d79 am: bdfd6681 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784716 Change-Id: Ifd3e58c7722dd6e179a12c56316c7d825a5d56ad Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Hunter Knepshield authored
Merge "Add BarringInfo.BarringServiceInfo#toString" into main am: 6f25c5b7 am: 4f154870 am: 70669dec Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779769 Change-Id: Ic07dcafb096ccf3162de671f3304f8ce31383663 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>
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main am: 8469d746 am: e1702d79 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784716 Change-Id: I353c31719845acdec08bf847e2a065667d190863 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Varun Shah authored
-
Song Chun Fan authored
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main am: 8469d746 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2784716 Change-Id: I551790a606f14e9e1bb98ef6fe566a2d83e7657a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
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>
-
Hunter Knepshield authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779769 Change-Id: I7d079514bb95899e0b8b2a32d9c33667866aae5e 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>
-
Raymond Hernandez authored
Merge "Add monicamwang and rayhdez to frameworks/base/services/core/java/com/android/server/stats/OWNERS" into main
-
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>
-
Hunter Knepshield authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2779769 Change-Id: I9e57c03d5c89c100b3ee78a88fadbb7493998d22 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
-