- Sep 23, 2023
-
-
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
-
-
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
-
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 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
-
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 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>
-
Jihoon Kang authored
[automerger skipped] Move java_api_library modules to f/b/api/StubLibraries.bp am: 7b627eda -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: Ica0cb121be9d2d848235d334176768ca8ae8f21b Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jihoon Kang authored
-
Jayachandran C authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2754967 Change-Id: Ibc899770c9c6ff1f60611a7b55aab8b98b53eb41 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jayachandran C authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2754967 Change-Id: If5c412fb861ad9b2e64db442a9bcb15c4c223566 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Jayachandran C authored
-
Oleg Petšjonkin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2755137 Change-Id: I370518816ece940cb1dbe9717a6bf481d841f721 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Liz Kammer authored
The auto-generated Flags.FLAG_NAME constants are difficult to review in API tracking files. metalava will expand annotation arguments if (1) the field declaration is known to metalava, and (2) the constant is not part of the API surface. The auto-generated constants are hidden, so not part of any API surface. This satisfies (1). This CL adds the auto-generated sources to metalava's input. This satisfies (2). (cherry picked from commit 01544b94) Bug: 297881670 Test: m checkapi Test: m <partition>/etc/aconfig_flags.textproto & diff against a clean build Merged-In: I757c6e87d81768ef6095a4bea67c74c3ae6028a7 Change-Id: I757c6e87d81768ef6095a4bea67c74c3ae6028a7
-
Oleg Petšjonkin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2755137 Change-Id: I58e429bba013b17f66ddf646cd7bd4b5796714ac Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Oleg Petšjonkin authored
-
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 Merged-In: I479ec3b1554dcc6630207c5f095c6f9d211b035b Change-Id: I4f7ea80608945d3d1840751e25fa7b0f92c119b8
-
Thiébaud Weksteen authored
Merge "Add reporting tool for migration to @EnforcePermission" into main am: 03e470ea am: eeb09cdb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2745027 Change-Id: Id6f982e20a94c3af44ac6af611c8a7ac08efe4c2 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Ale Nijamkin authored
Merge "Hide camera affordance when secure Camera is disabled" into main am: 6e51daa4 am: 20848e47 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2753845 Change-Id: I9e0b60f08a48c2e7f06829059761ec2fe3567033 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/+/2745027 Change-Id: I126fa38c0e413fea5db2181a7884bab167304457 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
- Sep 20, 2023
-
-
Ale Nijamkin authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2753845 Change-Id: Ibddf56329661553741c531da0237ab834035edec Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Thiébaud Weksteen authored
-
Ale Nijamkin authored
-
Andrew Solovay authored
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24811684 Change-Id: I73b2f20ca552fb099a017af7cd184497162d6fdf Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Kevin Chyn authored
Fixes: 297949293 Bug: 223153452 Test: run each test with 100 iterations Change-Id: I333dcc2c10346ce585d1c5e7f16cad113b2b5a95 Merged-In: I333dcc2c10346ce585d1c5e7f16cad113b2b5a95
-
Christopher Parsons authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2751686 Change-Id: I11b89dcfb2fec20a4726babe822766ee0893d6a3 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Christopher Parsons authored
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2751686 Change-Id: Ifbe695574139c1f1f674da0470f6b1885114bcad Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Christopher Parsons authored
-
Andrew Solovay authored
A couple of code snippets in a doc comment incorrectly referred to the "android.permissions.FOREGROUND_SERVICE_SPECIAL_USE" permission name; this should actually be "android.permission.FOREGROUND_SERVICE_SPECIAL_USE" (permission, not permissions), per: https://developer.android.com/reference/android/Manifest.permission#FOREGROUND_SERVICE_SPECIAL_USE Docs-only change, no change to actual source code. Bug: 299736596 Change-Id: I630f13c19bfb2418ff4feb1c20ac4540ba0e8ef6 Test: [go/abtd docs build]
-