Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
651,310 Commits 3 Branches 0 Tags
3057504bee36264bcb9f4b75d3aaacbef62ab9d8
Commit Graph

651310 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hongwei Wang
3057504bee Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev am: 5a59072018 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264487

Change-Id: Ibe24016daf3ee670b498a24eb80ae3dc2f1df0b3
 2021-07-15 00:07:30 +00:00
Hongwei Wang
5a59072018 Merge "Fix letterbox issue when auto-enter-pip from landscape" into sc-dev 2021-07-14 23:52:42 +00:00
Jeff Sharkey
5d6be79488 Merge "Root UID can synthesize AttributionSource values." into sc-dev am: 9d0ddef67b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285879

Change-Id: Id4254922cb486ba49eebe55caa74249583c4d5bd
 2021-07-14 23:37:58 +00:00
Jeff Sharkey
9d0ddef67b Merge "Root UID can synthesize AttributionSource values." into sc-dev 2021-07-14 23:25:08 +00:00
TreeHugger Robot
c0ae86808c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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: I3ecded665a9cefdefa46eb10bc05a876a7a68e5d
 2021-07-14 22:17:11 +00:00
TreeHugger Robot
8d5fccaf10 Merge "Avoid sampling outside BQ crop rect" into sc-dev am: 5c86f2885f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283873

Change-Id: I2c149a2cb36394e027f16b8589021233cefaf980
 2021-07-14 22:16:39 +00:00
TreeHugger Robot
ec4c156922 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 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: Ib1ee2ecc8cf018da7608a7a364cad631cfd9e203
 2021-07-14 22:15:45 +00:00
Sudheer Shanka
6df07a5193 Merge "Add SafetyNet logging if a certain broadcast is received by apps." into sc-dev am: 0fd8262e2e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15129351

Change-Id: I74b93b7fa91c64ad5417e5fd269df7a0d309586d
 2021-07-14 22:15:23 +00:00
TreeHugger Robot
6cc2381562 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-14 22:14:13 +00:00
TreeHugger Robot
5c86f2885f Merge "Avoid sampling outside BQ crop rect" into sc-dev 2021-07-14 22:09:13 +00:00
TreeHugger Robot
76e9cc0f08 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-14 22:02:06 +00:00
Sudheer Shanka
0fd8262e2e Merge "Add SafetyNet logging if a certain broadcast is received by apps." into sc-dev 2021-07-14 21:59:33 +00:00
Jakub Pawlowski
308797afcf [automerger skipped] Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d049 am: aee55feaa6 -s ours 
am skip reason: Merged-In Icf8906c972cf18d65a22d30c3a628fd54db59179 with SHA-1 866cf34016 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907

Change-Id: I590a615a2ff9cd54f9bfbf5f21628bb8c464b1aa
 2021-07-14 20:57:52 +00:00
Jakub Pawlowski
d1acb1da9f [automerger skipped] Get rid of ResultStorageDescriptor in startScan am: 5aa40b903a am: 9cf37f5fe7 -s ours 
am skip reason: Merged-In Ia2d65def69b13150a20e8a2077c3fe630f8ec86e with SHA-1 374836844e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765906

Change-Id: I7862aa492a50379dd9ac220370979eec0c850bb0
 2021-07-14 20:57:31 +00:00
Jakub Pawlowski
aee55feaa6 Merge changes from topic "cherrypick-BT-result-storage-descriptor" am: 245ce4d049 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765907

Change-Id: Ifd5482b6d0bfc5d185608ca113490704644405af
 2021-07-14 20:45:29 +00:00
Jakub Pawlowski
9cf37f5fe7 Get rid of ResultStorageDescriptor in startScan am: 5aa40b903a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1765906

Change-Id: I9b2bcb02cfd4954f6cd5671dba60916631575f7b
 2021-07-14 20:45:27 +00:00
Jeff Sharkey
38ffbde17e Root UID can synthesize AttributionSource values. 
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-14 14:35:17 -06:00
TreeHugger Robot
f0d6a83ce1 Merge changes I5d467e8e,I5795f5ad into sc-dev am: e684a19bbb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15284263

Change-Id: Iaa891545035e8be0be12e1487b510d5f6d2c1480
 2021-07-14 20:26:24 +00:00
Jordan Demeulenaere
403a82e049 Merge "Fix ActivityLaunchAnimatorTest crash" into sc-dev am: 94240f3acd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15283591

Change-Id: Ib141fa03a669e700fb6e383a86545d8f01695d55
 2021-07-14 20:25:57 +00:00
TreeHugger Robot
a0c063e050 Merge "Separating alarm history for lower quota" into sc-dev am: 977e2adc14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15264659

Change-Id: Id477baaa0b8df977b61a6db98afe4f9301581092
 2021-07-14 20:25:08 +00:00
TreeHugger Robot
e684a19bbb Merge changes I5d467e8e,I5795f5ad into sc-dev 
* changes:
  Trigger udfps-start haptic on the first fingerDown
  Remove test haptics for UX
 2021-07-14 20:21:36 +00:00
Jakub Pawlowski
245ce4d049 Merge changes from topic "cherrypick-BT-result-storage-descriptor" 
* changes:
  Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
  Get rid of ResultStorageDescriptor in startScan
 2021-07-14 20:21:36 +00:00
Jordan Demeulenaere
94240f3acd Merge "Fix ActivityLaunchAnimatorTest crash" into sc-dev 2021-07-14 20:12:14 +00:00
TreeHugger Robot
977e2adc14 Merge "Separating alarm history for lower quota" into sc-dev 2021-07-14 20:09:15 +00:00
TreeHugger Robot
f7eaea5a90 Merge "Add additional clarification regarding nanoapp loading APIs" into sc-dev am: 65731d06ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15286092

Change-Id: I3f853d5f4514969aba00de0112788500c4897b42
 2021-07-14 20:03:07 +00:00
TreeHugger Robot
65731d06ce Merge "Add additional clarification regarding nanoapp loading APIs" into sc-dev 2021-07-14 19:50:37 +00:00
Bill Yi
47fb0c2b6d Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibd930a657066bc348fe7f054d0f97baa313aec59
 2021-07-14 19:46:30 +00:00
TreeHugger Robot
90059200e9 Merge "Set wallet lockscreen icon tint with text primary color." into sc-dev am: 528aa5fec8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15274502

Change-Id: I86e017923f24259e6dec62ae2242a49276a8e833
 2021-07-14 19:12:34 +00:00
TreeHugger Robot
528aa5fec8 Merge "Set wallet lockscreen icon tint with text primary color." into sc-dev 2021-07-14 19:08:45 +00:00
Yifan Hong
e1ba2e5fbf Merge "AndroidRuntime: Expose javaAttachThread / javaDetachThread." am: 6b45a9a7b9 am: 1149562e10 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751551

Change-Id: I55d43c99df7b81fc9a8d2c04a8ab8069a95e3c5b
 2021-07-14 19:07:57 +00:00
TreeHugger Robot
1c7a507a47 Merge "Fix log spam that got in here somehow." into sc-dev am: 75c9ab5778 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15285499

Change-Id: Iad4e9452b331191e9d5c3a7fb8b2138a5634b888
 2021-07-14 19:06:35 +00:00
TreeHugger Robot
75c9ab5778 Merge "Fix log spam that got in here somehow." into sc-dev 2021-07-14 18:45:14 +00:00
TreeHugger Robot
c817fdc0e6 Merge "Defensively copy callback collections before invoking" into sc-dev am: 4172f20f6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15273671

Change-Id: Ic2435f18d980b98e82ea421b46c4a9c56764f576
 2021-07-14 18:42:50 +00:00
TreeHugger Robot
4172f20f6e Merge "Defensively copy callback collections before invoking" into sc-dev 2021-07-14 18:39:55 +00:00
Yifan Hong
1149562e10 Merge "AndroidRuntime: Expose javaAttachThread / javaDetachThread." am: 6b45a9a7b9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1751551

Change-Id: I40162e6db55320f1c3f0b27768b42a6dbe10e323
 2021-07-14 18:37:01 +00:00
Peter Kalauskas
17e41389d7 Merge "Fix visibility issue in QS detail panels" into sc-dev am: 8527610e55 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15278212

Change-Id: I0ccf98a859333dea4dfdb2a0fb0eee2b03887699
 2021-07-14 18:36:10 +00:00
Curtis Belmonte
95d69b9d7b Merge "Fix a11y of BiometricPrompt icon and help text" into sc-dev am: f33717e74a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15276031

Change-Id: I343adfc49ae53136fa13b24b8f6c2d6fca415134
 2021-07-14 18:35:38 +00:00
John Reck
0f284da923 Avoid sampling outside BQ crop rect 
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-14 14:26:14 -04:00
Peter Kalauskas
8527610e55 Merge "Fix visibility issue in QS detail panels" into sc-dev 2021-07-14 18:24:24 +00:00
Yifan Hong
6b45a9a7b9 Merge "AndroidRuntime: Expose javaAttachThread / javaDetachThread." 2021-07-14 18:16:57 +00:00
Curtis Belmonte
f33717e74a Merge "Fix a11y of BiometricPrompt icon and help text" into sc-dev 2021-07-14 18:16:31 +00:00
Beverly
b1af897b68 Trigger udfps-start haptic on the first fingerDown 
Previously, AOD interrupts wouldn't receive the start haptic

Test: manual
Fixes: 193556998
Change-Id: I5d467e8ea0feaca673341bead493c1cacc565028
 2021-07-14 18:10:50 +00:00
Lyn Han
011d50ddab Merge "Set views below shelf explicitly invisible to skip hardware rendering" into sc-dev am: 1da11b55e9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15261872

Change-Id: I638ce6506c8795a6025189b6c5389dd44a4c8bc9
 2021-07-14 17:49:35 +00:00
Zimuzo Ezeozue
7e28d02d1c Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev am: 964a1e0f72 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15272231

Change-Id: I26d443256baa498dce220c9089b6ecb44c46c359
 2021-07-14 17:49:14 +00:00
Jakub Pawlowski
f4c0d7097c Merge changes from topic "cherrypick-BT-result-storage-descriptor-remove-t1jhhedypv" into sc-dev-plus-aosp 
* changes:
  Bluetooth: deprecate TruncatedFilter and ResultStorageDescriptor
  Get rid of ResultStorageDescriptor in startScan
 2021-07-14 17:48:10 +00:00
Lyn Han
1da11b55e9 Merge "Set views below shelf explicitly invisible to skip hardware rendering" into sc-dev 2021-07-14 17:43:27 +00:00
Zimuzo Ezeozue
964a1e0f72 Merge "Fix wrong LEGACY_STORAGE appop grant" into sc-dev 2021-07-14 17:36:07 +00:00
Arthur Ishiguro
14c466a999 Add additional clarification regarding nanoapp loading APIs 
Fixes: 190533027
Test: None, comment only
Change-Id: If54e4093092be697845a53fbd617f6b2b46f420f
 2021-07-14 17:30:29 +00:00
Automerger Merge Worker
19d649e5f3 Merge "[automerger skipped] Merge "Cleanup the public API getActiveNetworkForUid on AOSP" am: 06c19fa5d4 am: a8b2994fc9 -s ours" into sc-dev-plus-aosp 2021-07-14 17:03:46 +00:00
TreeHugger Robot
0161aa2a9f Merge "Limit overscroll stretch for animation" into sc-dev am: b42f19e297 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15161821

Change-Id: I9fa60ede298eebe915ec8334d5b27af674ff136e
 2021-07-14 17:02:21 +00:00