- Sep 23, 2023
-
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758091 Change-Id: I8a1ddf618df32497459305ef798fddd9e0ca2a5f Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758091 Change-Id: I83e7c388bb544170c1a5bee1c31b9ef88c29a465 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Andrew Solovay authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24670029 Change-Id: Idb998e0d242272b47c7addcd428f8ffe140292dd Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Andrew Solovay authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24670029 Change-Id: I6d08ad9b620fb0c2185e1c2c8d6ed4b11deb1a6a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Treehugger Robot authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758091 Change-Id: I60daa52f4caa443a453f6824d265db0009f32991 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Andrew Solovay authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24670029 Change-Id: I7ca77246561baeacdf06b1103410942df925cc04 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Andrew Solovay authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24670029 Change-Id: I097230b6c88c6ae41d0897203e4b708481a5604a Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
- Sep 22, 2023
-
-
Treehugger Robot authored
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f3 -s ours am: 4e40bd70 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Iac12d592b5facfc6db49407644d385b2a089287d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa12913 -s ours am: 3198390e -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: I762e03a64a413e6a6854e69f74698a4459065b04 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f3 -s ours am: 3ee339a4 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: I95ed3d56769a0a6e931c8f5ab5f43f61d0e1d71e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
[automerger skipped] Revert "On device lockdown, always show the keyguard" am: eaa12913 -s ours am: 02912212 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Iec89433e121def81b92a6c0312924c65f4ea9991 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f3 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Ib6e1f206aeafbf716192e5c423ca193a0ede4049 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Iffe273097df8a4b91952afdc9419eafb07a46636 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into udc-dev am: b708c4f3 -s ours am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Id0ceedfe172fb7aa7fe75e3b821ddd5afc302b56 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Beverly Tai authored
am skip reason: Merged-In I9a7c5e1acadabd4484e58573331f98dba895f2a2 with SHA-1 100ae423 is already in history. Merged-In was found from reverted change. Reverted change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23088548 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24762427 Change-Id: Ic915a1a1cf4c99500000cf7620dac85f1e58b092 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Andrew Solovay authored
Quick fix to a typo in a code snippet in the refdoc comment. No change to code. Bug: 299043331 Change-Id: I66594d83ee985a9fd402ff26ea18e1a880030e3c Test: [go/abtd docs build]
-
Beverly Tai authored
-
Jihoon Kang authored
Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp am: d4d80280 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24831447 Change-Id: I2df3b46a4a792a313b3ec88e13a03cfcb42a5572 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jihoon Kang authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24831447 Change-Id: I31c22cfbe80b8ec4e15e3a056fe5437d934a7f00 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jihoon Kang authored
Merge "RESTRICT AUTOMERGE Move java_api_library modules to f/b/api/StubLibraries.bp" into udc-dev-plus-aosp
-
Mårten Kongstad authored
Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb6 am: 0275f893 am: 48567b75 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286 Change-Id: If6070e8cf24a17ac8099db113f887b5a4368746d Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Thiébaud Weksteen authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758608 Change-Id: I35ffa7c472f491286ad236562e863234ba28c0b3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Mårten Kongstad authored
Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main am: 779ebfb6 am: 0275f893 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286 Change-Id: I29b4d2cf845030d88f030c5b6a16160367ed5888 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Thiébaud Weksteen authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758608 Change-Id: Ib6e0d9bdd0cae216c7f49e0d4d2bb1e310843678 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Mårten Kongstad authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2759286 Change-Id: I3a2b01b9d8885c71a5cb906cfa6005a98c7f2575 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Mårten Kongstad authored
-
Thiébaud Weksteen authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2758608 Change-Id: I7eb9769f91318a8ebb28f9b26f709c6a1e377384 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Thiébaud Weksteen authored
-
Kevin Chyn authored
[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0 am: a281783a -s ours am: a5720827 -s ours am skip reason: Merged-In I333dcc2c10346ce585d1c5e7f16cad113b2b5a95 with SHA-1 374bce76 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756286 Change-Id: I3e41a3d71ff8e96761a05a9c273b6b6f31ebffeb Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kevin Chyn authored
[automerger skipped] Merge "Fix several flaky DeviceStateManagerServiceTests" into main am: 059630c0 am: a281783a -s ours am skip reason: Merged-In I333dcc2c10346ce585d1c5e7f16cad113b2b5a95 with SHA-1 374bce76 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756286 Change-Id: I2144253237c54ede8f479d743a167e5d2b89515e Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kevin Chyn authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2756286 Change-Id: I76afdd924f74848bc6a29affb1cc60e720438a36 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kevin Chyn authored
-
Pawan Wagh authored
Use null class loader to fuzz readParcelable. Bug: 301519740 Test: m java_binder_parcel_fuzzer && ./jazzer_helper.sh --fuzz_target java_binder_parcel_fuzzer --target_class parcelfuzzer.ParcelFuzzer Change-Id: Ieeff3cf9ea5734441d417d16691d7ca9b708c5b3
-
Thiébaud Weksteen authored
Commit df4cd065 updated how command line arguments are parsed. However, sys.argv[0] should be ignored (as this is the name of the program). Remove the argument, so the default value (sys.argv[1:]) is used. Also, use the embedded_launcher so that the help renders as: usage: lint_fix [-h] instead of: usage: usage: __soong_entrypoint_redirector__.py [-h] Test: lint_fix --print --no-fix --check AnnotatedAidlCounter \ --lint-module AndroidUtilsLintChecker services.autofill Change-Id: I00e3e3b70c9715e363d3448ae84bf9ff161f2306
-
Jihoon Kang authored
This change was already submitted with https://android-review.git.corp.google.com/q/topic:%22revert-2713677-revert-2655262-move_java_api_libraries-JTESUMBERD-FPSEKJYXCE%22 but was never propagated to downstream. Test: m nothing --build-from-text-stub Change-Id: I0d107ceb59cc53ec6663145796f4e4b0b74f2dc9
-
- Sep 21, 2023
-
-
Jihoon Kang authored
[automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 6eaafcd2 -s ours am: 039b58a8 -s ours am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 fdebc334 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24818927 Change-Id: Ic0086ca4c9381b10cb3f83013a7b292e4a9fd4a3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jihoon Kang authored
[automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 7b627eda -s ours am: be6f1a19 -s ours am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 fdebc334 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24818927 Change-Id: I1bda83c93ae0310535ef2aeabf21d85b481cf2ae Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jayachandran C authored
Merge "Add google-owned SMS short codes for Palestine" into main am: 08c0d31c am: 4367c6f0 am: 33f63e92 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2754967 Change-Id: I4aac9a51dc3f21eb2fb651e20d9af9084883eafb Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jihoon Kang authored
[automerger skipped] Merge "Move java_api_library modules to f/b/api/StubLibraries.bp" into aosp-main-future am: 6eaafcd2 -s ours am skip reason: Merged-In I479ec3b1554dcc6630207c5f095c6f9d211b035b with SHA-1 fdebc334 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24818927 Change-Id: I777f583e4275cf5b232625957b135a047af1aa50 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-