summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-07-15Snap for 7550844 from 5e3e0ab4c345cf53545f8ef2c14f1dc90db4cdc2 to ↵android-mainline-12.0.0_r8android-mainline-12.0.0_r25android12-mainline-conscrypt-releaseAndroid Build Coastguard Worker
mainline-conscrypt-release Change-Id: Iabcc6a8d15d2c82e90a8af3ead1e2a6a5f5eb084
2021-07-15[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 35c56e88e4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15287451 Change-Id: Ic1fd80c62f682824ca92a75c2a33a72c781a788d
2021-07-15Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2021-07-15Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev ↵Hongwei Wang
am: 5a59072018 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264487 Change-Id: I3f879a2f7bc9285c0d4c00ef49dfed824a1cdaaa
2021-07-14Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-devHongwei Wang
2021-07-14Merge "Root UID can synthesize AttributionSource values." into sc-dev am: ↵Jeff Sharkey
9d0ddef67b Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285879 Change-Id: I3bc83265bcbc9cc09167e0d73916f28156a64fe8
2021-07-14Merge "Root UID can synthesize AttributionSource values." into sc-devJeff Sharkey
2021-07-14[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 6cc2381562 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286977 Change-Id: I18db7b59627fc48a6c2530413bfc7e0dcf0fad45
2021-07-14Merge "Avoid sampling outside BQ crop rect" into sc-dev am: 5c86f2885fTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283873 Change-Id: Ic7f0adaef299547ee23e69fd4fa9640d41515a9c
2021-07-14[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into ↵TreeHugger Robot
sc-dev am: 76e9cc0f08 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15279862 Change-Id: I808c7b3555a95812e1ac8d275159287b2b780587
2021-07-14Merge "Add SafetyNet logging if a certain broadcast is received by apps." ↵Sudheer Shanka
into sc-dev am: 0fd8262e2e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15129351 Change-Id: Ic877c6fee616ed3a0fceadf25f65f1fc979856a0
2021-07-14Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2021-07-14Merge "Avoid sampling outside BQ crop rect" into sc-devTreeHugger Robot
2021-07-14Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-devTreeHugger Robot
2021-07-14Merge "Add SafetyNet logging if a certain broadcast is received by apps." ↵Sudheer Shanka
into sc-dev
2021-07-14Root UID can synthesize AttributionSource values.Jeff Sharkey
We trust any incoming value from the system UID, so we should also trust values coming from the root UID, which includes many shell commands such as "svc". Bug: 193659633 Test: atest BluetoothInstrumentationTests:com.android.bluetooth.btservice.AdapterServiceTest --rerun-until-failure 100 Change-Id: Ied07731345f08fc3c4df465a3773e35c8df7c59a
2021-07-14Merge changes I5d467e8e,I5795f5ad into sc-dev am: e684a19bbbTreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15284263 Change-Id: Iffcf0f694d2d5cbe264ea760b0e845d561ae2e0a
2021-07-14Merge "Fix ActivityLaunchAnimatorTest crash" into sc-dev am: 94240f3acdJordan Demeulenaere
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283591 Change-Id: Ie65ae22076d45707ebd7a394af7978176b3347f9
2021-07-14Merge "Separating alarm history for lower quota" into sc-dev am: 977e2adc14TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264659 Change-Id: I7acd562f316859c8f31adf6037aa3da1361856b2
2021-07-14Merge changes I5d467e8e,I5795f5ad into sc-devTreeHugger Robot
* changes: Trigger udfps-start haptic on the first fingerDown Remove test haptics for UX
2021-07-14Merge "Fix ActivityLaunchAnimatorTest crash" into sc-devJordan Demeulenaere
2021-07-14Merge "Separating alarm history for lower quota" into sc-devTreeHugger Robot
2021-07-14Merge "Add additional clarification regarding nanoapp loading APIs" into ↵TreeHugger Robot
sc-dev am: 65731d06ce Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286092 Change-Id: I648f666160150beff922a5616d2751f7c326416d
2021-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: I9b3b2ba8d6c4eba0c18428b0a29e17ea0de25b3e
2021-07-14Merge "Add additional clarification regarding nanoapp loading APIs" into sc-devTreeHugger Robot
2021-07-14Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ibd930a657066bc348fe7f054d0f97baa313aec59
2021-07-14Merge "Set wallet lockscreen icon tint with text primary color." into sc-dev ↵TreeHugger Robot
am: 528aa5fec8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15274502 Change-Id: Icc7118469832cfafac46048847c262cd46480a6d
2021-07-14Merge "Set wallet lockscreen icon tint with text primary color." into sc-devTreeHugger Robot
2021-07-14Merge "Fix log spam that got in here somehow." into sc-dev am: 75c9ab5778TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285499 Change-Id: Ifd866f86e802fb0058ddacf58d734f08821fad4c
2021-07-14Merge "Fix log spam that got in here somehow." into sc-devTreeHugger Robot
2021-07-14Merge "Defensively copy callback collections before invoking" into sc-dev ↵TreeHugger Robot
am: 4172f20f6e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273671 Change-Id: I998f60ddf762dcf9a846a17ecbff89cdc4e2063f
2021-07-14Merge "Defensively copy callback collections before invoking" into sc-devTreeHugger Robot
2021-07-14Merge "Fix visibility issue in QS detail panels" into sc-dev am: 8527610e55Peter Kalauskas
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15278212 Change-Id: I0d6f34eb471d8ad6f24b93dc2e503888bc6bdb2b
2021-07-14Merge "Fix a11y of BiometricPrompt icon and help text" into sc-dev am: ↵Curtis Belmonte
f33717e74a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15276031 Change-Id: Icdc5db371fce4cfa73b223e6d3d5862cd2b7717f
2021-07-14Avoid sampling outside BQ crop rectJohn Reck
The region outside of the BQ crop rect is potentially garbage. Avoid sampling from it. Fixes: 189656466 Test: CTS PixelCopyTests & DecodeAccuracyTest Change-Id: I2910d93471f08aaf807ac9f87fdf84cf29cf4143
2021-07-14Merge "Fix visibility issue in QS detail panels" into sc-devPeter Kalauskas
2021-07-14Merge "Fix a11y of BiometricPrompt icon and help text" into sc-devCurtis Belmonte
2021-07-14Trigger udfps-start haptic on the first fingerDownBeverly
Previously, AOD interrupts wouldn't receive the start haptic Test: manual Fixes: 193556998 Change-Id: I5d467e8ea0feaca673341bead493c1cacc565028
2021-07-14Merge "Set views below shelf explicitly invisible to skip hardware ↵Lyn Han
rendering" into sc-dev am: 1da11b55e9 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15261872 Change-Id: I5623a04abb1ed2a0a2f4fd816d8fbda384533018
2021-07-14Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev am: 964a1e0f72Zimuzo Ezeozue
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15272231 Change-Id: If26e96b98d575924e199d6132f38e58028324e65
2021-07-14Merge "Set views below shelf explicitly invisible to skip hardware ↵Lyn Han
rendering" into sc-dev
2021-07-14Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-devZimuzo Ezeozue
2021-07-14Add additional clarification regarding nanoapp loading APIsArthur Ishiguro
Fixes: 190533027 Test: None, comment only Change-Id: If54e4093092be697845a53fbd617f6b2b46f420f
2021-07-14Merge "Limit overscroll stretch for animation" into sc-dev am: b42f19e297TreeHugger Robot
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161821 Change-Id: Ie3933022707a7e5c1fb9688314019be2fc0e5703
2021-07-14Merge "Fix VibrationThread with repeating waveforms of positive amplitudes" ↵TreeHugger Robot
into sc-dev am: 9ab91ae6f4 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15245532 Change-Id: I04df6fc69a577511ed374b69281e904a7ab68f43
2021-07-14Merge "Limit overscroll stretch for animation" into sc-devTreeHugger Robot
2021-07-14Set wallet lockscreen icon tint with text primary color.Silin Huang
Test: manual Bug: 193539706 Change-Id: I0b68780c560db487d31715f05e8300309fc941e5
2021-07-14Merge "Fix VibrationThread with repeating waveforms of positive amplitudes" ↵TreeHugger Robot
into sc-dev
2021-07-14Merge "ViewRootImpl: Use mWindowAttributes directly for BBQ" into sc-dev am: ↵Rob Carr
b10b4141a5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14908372 Change-Id: I428164a097ab227394e6aaffc457cfa550a4c51f
2021-07-14Merge "ViewRootImpl: Use mWindowAttributes directly for BBQ" into sc-devRob Carr