Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
643,624 Commits 3 Branches 0 Tags
ebbb0ce80098f34905cc483a2022a616c30427e1
Commit Graph

643624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jayant Chowdhary
ebbb0ce800 OutputConfiguration: fix CREATOR readList for sensor pixel modes. 
OutputConfiguration uses writeIntArray in writeToParcel. It must use
readIntArray in createFromParcel instead of readList.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel. When read again, the exception is
      thrown and not swallowed.

Test: create OutputConfiguration; add certain sensorPixelModes;
      writeToParcel; set parcel's data position to 0; create
      OutputConfiguration from same parcel and read sensor pixel modes.
      They match.

Change-Id: Id50396d328ba6fc830012a1c359934cf82249764
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2021-06-10 23:52:37 -07:00
Jayant Chowdhary
6b0bcd60c8 camera2: Fix exception swallowing in params classes createFromParcel 
Do not catch exceptions when we attempt to create the following classes
from a parcel
- OutputConfiguration
- VendorTagDescriptor
- VendorTagDescriptorCache
- SessionConfiguration
This could cause subsequent parcel information to be read incorrectly.

Bug: 188675581

Test: Sample app which tries to write invalid data into an
      OutputConfiguration parcel to send in an intent via Broadcast. When read by the receiving app,
      gets an exception (not swallowed).

Change-Id: I745ca49daa6ca36b1020d518e9f346b52684f2b1
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
 2021-06-10 11:44:27 -07:00
Alex Salo
4e46adb808 Merge "Adds protection level 'role' to SYSTEM_CAMERA permission" into sc-dev 2021-06-10 16:00:43 +00:00
Pavel Grafov
c0115519f6 Merge "Don't reset user VPN without reason" into sc-dev 2021-06-10 15:31:04 +00:00
Daniel Sandler
be14ed4870 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 51855b1f12 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 1fc88c383e is already in history

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

Change-Id: I4c514ab3bdfa661d5995084ebab4cf003b945086
 2021-06-10 15:27:37 +00:00
Daniel Sandler
99c8d90be8 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours am: 6d4c20323b -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: I1d51594476b2a30d582c4c0a6ce94a0fa46ff2ac
 2021-06-10 15:27:11 +00:00
Lucas Dupin
7926715151 Merge "Do not post color event, run it directly" into sc-dev 2021-06-10 15:23:55 +00:00
Lucas Dupin
0af4538527 Merge "Apply colors when a non managed user is added" into sc-dev 2021-06-10 15:22:02 +00:00
Soonil Nagarkar
f1f0b2e333 Merge "Add more logging around extra attribution tags" into sc-dev 2021-06-10 15:20:04 +00:00
Pavel Grafov
1142e5e8cb Merge "Don't leak AccessibilityManager binder proxy." into sc-dev 2021-06-10 15:16:34 +00:00
Daniel Sandler
51855b1f12 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ie9162189e545ee928fb5e0845e0755191dd009b0
 2021-06-10 15:11:12 +00:00
Daniel Sandler
6d4c20323b [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours am: 0f735a7bb3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ib2cf7693bde66b42a960f442649aa0b13bf99ae0
 2021-06-10 15:10:38 +00:00
Daniel Sandler
0f735a7bb3 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 am: 1f0a6621ad -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Ib85e3b41e02f79527416a455d3e57eecd0b7b5a9
 2021-06-10 14:53:21 +00:00
Daniel Sandler
1f0a6621ad Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev am: 7e742dca13 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673294

Change-Id: I52ec38b96a54250bf25ef0da255e20b7a2f65f71
 2021-06-10 14:25:04 +00:00
Daniel Sandler
7e742dca13 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into qt-dev 2021-06-10 14:04:24 +00:00
TreeHugger Robot
271c600617 Merge "Add null check on NPVC" into sc-dev 2021-06-10 13:22:35 +00:00
Edgar Wang
fbaec9bd4d Merge "Set progressBarHorizontal style in Theme.SettingsBase" into sc-dev 2021-06-10 12:56:21 +00:00
Tiger Huang
50ae7cbf1b Merge "Defer dispatching insets to app if its window frame will be changed soon" into sc-dev 2021-06-10 07:55:53 +00:00
Lucas Dupin
e750ddd8fb Apply colors when a non managed user is added 
This way we'll be able to have colors on SetupWizard when added a
secondary user.

Test: manual
Test: atest ThemeOverlayControllerTest
Fixes: 189168701
Change-Id: I8c7e5cc3a4804c34ad4ace0ba473a373b939cb83
 2021-06-09 21:16:47 -07:00
Ilya Matyukhin
aa12b6a492 Merge "Fix UDFPS touch coordinates reported to the HAL" into sc-dev 2021-06-10 02:16:58 +00:00
Rhed Jao
6b6917944d Merge "Fix side channel leakage from the api of overrideLabelAndIcon" into sc-dev 2021-06-10 01:46:32 +00:00
Winson Chung
27475c6e0c Fix regressions with reparenting task 
- Make the new task immediately visible, and reset the crop on the
  original task transferred from the leash

Fixes: 190550846
Test: Open ApiDemos, autoenter from a task with multiple activities

Change-Id: I2527cee68448dc8f1be7634051547c29c596c63a
 2021-06-10 00:33:30 +00:00
Lucas Dupin
9b34b73ece Do not post color event, run it directly 
If setup wizard is not complete, run the theme application directly
instead of posting it to a Handler.

Test: atest ThemeOverlayControllerTest
Fixes: 190580756
Change-Id: Ibe59526fe569766bdcb243652dc21ad35f83320c
 2021-06-09 17:08:36 -07:00
Josh Tsuji
f3f485c453 Merge "Fix issue where notifications are visible during screen off if bypass is enabled." into sc-dev 2021-06-09 23:35:21 +00:00
Ilya Matyukhin
18817f3ef5 Fix UDFPS touch coordinates reported to the HAL 
Bug: 189940935
Test: HAL logs
Change-Id: I4193d8a4ee21bfde49738ec7df05e4a28214ee48
 2021-06-09 16:21:31 -07:00
TreeHugger Robot
dfbde545f3 Merge "Hotword: Propagate the DSP DetectedResult." into sc-dev 2021-06-09 22:32:37 +00:00
James O'Leary
e0970984c8 Merge changes from topics "quantizer_improved_logic", "reintroduce_scaling_fixes" into sc-dev 
* changes:
  Quantize image to 128 colors instead of 5
  Quantizer improvements
  Sort colors from high count => low count
  Don't interpolate image input to quantizer
  Cache set wallpaper as PNG instead of JPEG
  Only rescale wallpaper if its > display height
 2021-06-09 22:23:24 +00:00
TreeHugger Robot
2eda3de204 Merge "Update the backgroud of checkbox for rotary" into sc-dev 2021-06-09 22:11:06 +00:00
Lucas Dupin
fe788b0b7b Merge "Revert zoom level" into sc-dev 2021-06-09 20:38:17 +00:00
Xiaoyu Jin
e298f682ca Merge "Use AppSearchConfig in PlatformLogger" into sc-dev 2021-06-09 20:26:47 +00:00
Max Bires
8092f01ce1 Merge "Revert "Fixing the race condition in GenerateRkpKey"" into sc-dev 2021-06-09 20:21:15 +00:00
Max Bires
56318a568f Revert "Fixing the race condition in GenerateRkpKey" 
This reverts commit d05498b9d8.

Reason for revert: Bugged on non-RKP systems.

Bug: 190222116
Change-Id: Ie7d17d4251c381c1bae6a76cd9b0246c551f8042
 2021-06-09 19:54:48 +00:00
Andy Hung
aadafc7bf2 Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev 2021-06-09 19:54:16 +00:00
TreeHugger Robot
648b6b5dd4 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: 548ddc79d3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 9c8b1512a5 is already in history

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

Change-Id: Iaf1a4699a19e745ed1a21d593fc0464b9deee56c
 2021-06-09 19:51:27 +00:00
Automerger Merge Worker
ac1f0eb45a Merge "[automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours" into sc-dev 2021-06-09 19:51:25 +00:00
TreeHugger Robot
e5c71c6990 [automerger skipped] Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d am: d74f2129d3 -s ours 
am skip reason: Merged-In Ie486396fd7328edf8ca0912df92524bb82a1fb7f with SHA-1 875fa991aa is already in history

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

Change-Id: I09559db4221b80dc2fa564183c38765ad7f27f13
 2021-06-09 19:51:15 +00:00
Tej Singh
61932ba12b [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: bc9a8147a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I698aa7200effbd9a9e6d3c3d93a159bc2f3c8b27
 2021-06-09 19:51:15 +00:00
Tej Singh
3f2ba9c995 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c am: d4b7b0e3da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8dc1552834b198177adea7242929a7b07fda1c9f
 2021-06-09 19:50:49 +00:00
TreeHugger Robot
548ddc79d3 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293

Change-Id: I868b0e88346f0674998770895a603e292cef4f9f
 2021-06-09 19:37:36 +00:00
Tej Singh
bc9a8147a3 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: Ic8f0c3d09b90e740f7118cac1843f1ac5e2b1b37
 2021-06-09 19:37:21 +00:00
Xiaoyu Jin
1b4254be03 Merge "Log two new fields for initializeStats" into sc-dev 2021-06-09 19:36:50 +00:00
TreeHugger Robot
d74f2129d3 Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev am: 665a84d29d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14673293

Change-Id: Ib92a9130bb53ab410758cd14d468af33bbdd7026
 2021-06-09 19:36:31 +00:00
Tej Singh
d4b7b0e3da [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours am: 4ad8ef142c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: If7b65e095d15a9d260438bcb017f10ad3cae59d1
 2021-06-09 19:36:07 +00:00
TreeHugger Robot
665a84d29d Merge "Fix race condition between lockNow() and updateLockscreenTimeout" into rvc-dev 2021-06-09 19:31:09 +00:00
Tej Singh
4ad8ef142c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 am: e72a13d44c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47c024483e5996e9268f6926b76f4282169907ec
 2021-06-09 19:24:13 +00:00
TreeHugger Robot
789fe38968 Merge "Remove tracing for notifyContentCapture" into sc-dev 2021-06-09 19:14:05 +00:00
Lucas Dupin
54d09e4352 Revert zoom level 
Bug: 189976220
Test: manual
Change-Id: I3b1595a905a2f079e144b33d25ea7c7c44526d30
 2021-06-09 12:07:44 -07:00
Tej Singh
e72a13d44c [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours am: af533b33b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14670137

Change-Id: I0677d318752ff2be05afb28f8db04480413722d7
 2021-06-09 18:42:55 +00:00
Josh Tsuji
51b42ea059 Fix issue where notifications are visible during screen off if bypass is enabled. 
- NotificationWakeUpCoordinator should prioritize screen off doze override.
- We should tell the stack scroll layout to switch to KEYGUARD so that it doesn't show notifs even if bypass is enabled.

Fixes: 190227875
Test: with/without face unlock and bypass
Change-Id: I902692fa6ae417c051a77b248fd3863f51e0bc36
 2021-06-09 14:42:20 -04:00
Steve Elliott
33f8e11606 Merge "Add callbacks for bouncer keyguard reset" into sc-dev 2021-06-09 18:26:41 +00:00