Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
27df379840 Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev am: 7949cf90ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523913

Change-Id: I20606064a364bd97f4dd93f7f6cce8a0acdc3f7f
 2021-08-13 17:39:28 +00:00
TreeHugger Robot
bff3df9ae8 Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev am: 7949cf90ac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523913

Change-Id: I48447105eda4efc2926e5991a4b42d4fd5c3af2f
 2021-08-13 17:31:55 +00:00
TreeHugger Robot
7949cf90ac Merge "Camera: Initialize the forward processor along with the repeating pipeline" into sc-dev 2021-08-13 17:29:14 +00:00
Jayant Chowdhary
28dcfc3a28 Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev am: 115b62decc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15507831

Change-Id: I1d36d170b6aaad82db2ba3924fbaa5a5dd3c0744
 2021-08-13 17:25:54 +00:00
Jayant Chowdhary
f2381fea39 Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev am: 115b62decc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15507831

Change-Id: I2cb5f3882d5088b111c3b0ab36634446aaad9c4c
 2021-08-13 17:23:50 +00:00
TreeHugger Robot
2f01685e4b Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522464

Change-Id: I85693fe957dab445243185c0dacbea79f072ef5d
 2021-08-13 17:23:26 +00:00
TreeHugger Robot
5dfec7560c Merge "Camera: Return sequence id for advanced extension requests" into sc-dev am: 1ce567e28f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522464

Change-Id: I091612c70946895958473d86e30065bebe1395c2
 2021-08-13 17:22:03 +00:00
Mark Renouf
da3585d59d Merge changes from topic "screenshots_logs" into sc-qpr1-dev am: f88195c2dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15533669

Change-Id: I46e1723ea4f74222623152fc220340f314c08950
 2021-08-13 17:19:00 +00:00
Jayant Chowdhary
115b62decc Merge "camera2: Documentation updates for ultra high resolution sensors." into sc-dev 2021-08-13 17:11:23 +00:00
TreeHugger Robot
1ce567e28f Merge "Camera: Return sequence id for advanced extension requests" into sc-dev 2021-08-13 17:09:56 +00:00
Mark Renouf
f88195c2dd Merge changes from topic "screenshots_logs" into sc-qpr1-dev 
* changes:
  Log additional UiEvents for long screenshots, include packageName
  requestScrollCapture: provide package name on exception
  Return packageName to scroll capture requests from SysUI
 2021-08-13 17:04:51 +00:00
Max Bires
9b1e1c4c08 Fixing a condition that can cause deadlock 
Callbacks on ServiceConnection happen on the main UI thread for an
application. Since the thread that calls bindService then immediately
blocks to wait for the service to be connected, this will cause a
deadlock if key operations are happening on the main UI thread.

This bug has likely not been detected yet since key operations are not
supposed to be performed on the main UI thread, however it was uncovered
in a similar application during other testing. This fix ensures the
ServiceConnection object's callbacks will be triggered from a separate
thread from the calling thread.

Bug: 196571032
Test: Apps that run key operations on the UI thread don't hang.
Change-Id: I630a0ef2560a8ebd962de54c65e3d6277133a1cb
 2021-08-13 08:59:29 -07:00
Jeff DeCew
7ce358c005 Collapse the CallStyle buttons to just an icon instead of truncating text. 
Fixes: 195019654
Test: post CallStyle notification without custom action; observe text
Test: post CallStyle notification with custom action; observe buttons shrink to icon only.
Test: repeat tests using various font and screen sizes.
Change-Id: Icbd6189a1e03494e481e8672263570ae2657f946
 2021-08-13 15:52:48 +00:00
Matt Pietal
0683612e8f Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-qpr1-dev am: 2ac8e5991c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542972

Change-Id: Icf8534c34476c4f27e72cb6812b9dda6f3a560ec
 2021-08-13 15:17:05 +00:00
Matt Pietal
2ac8e5991c Merge "KeyguardViewMediatorTest - Flaky test fix" into sc-qpr1-dev 2021-08-13 15:02:35 +00:00
Philip Junker
f413b9b2e1 [automerger skipped] Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev am: c20398b8d1 am: 3b6c805ec4 -s ours 
am skip reason: Merged-In Ie60adfe9fc667d883ad4a6b8d7582a4bc17d1549 with SHA-1 79023f08d3 is already in history

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

Change-Id: I13d661f980dc94d786e0896d7a488363857c6441
 2021-08-13 14:13:45 +00:00
Philip Junker
5c4eb00193 Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev am: c20398b8d1 am: c518d5d3ce 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15462072

Change-Id: I7322f0bc64e3f4e400faac63201318ccd1bf839c
 2021-08-13 14:13:30 +00:00
Philip Junker
3b6c805ec4 Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev am: c20398b8d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15462072

Change-Id: I3209ca3dafcaf47426bffa08c4da47a8a6667286
 2021-08-13 14:01:48 +00:00
Philip Junker
c518d5d3ce Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev am: c20398b8d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15462072

Change-Id: I9f5da7d2e54f1c912c1f5f090ffc585078bcf401
 2021-08-13 14:00:51 +00:00
Philip Junker
c20398b8d1 Merge "Disallow usb access to camera and mic devices if global privacy toggle is active" into sc-dev 2021-08-13 13:49:37 +00:00
Jeff Sharkey
a43b28a5b3 Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61 am: 9100f2f0bf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I21020a46e9018176601d833a642446db1c9e5d68
 2021-08-13 13:26:56 +00:00
Jeff Sharkey
74415c5bc2 Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61 am: 512bc4c6ec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I644808e3a34b21d66d5eafa6ca506f00c0464137
 2021-08-13 13:21:09 +00:00
Jeff Sharkey
9100f2f0bf Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I226e7715f3829ca5ac64f989c0b96b849495faf4
 2021-08-13 13:12:02 +00:00
Jeff Sharkey
512bc4c6ec Merge "Register IBluetoothManagerCallback per-process." into sc-dev am: 01034e6e61 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15523353

Change-Id: I7e3ef6ca49e2c4ed4a4876b23ae5889c257f4f2f
 2021-08-13 13:10:06 +00:00
Jeff Sharkey
01034e6e61 Merge "Register IBluetoothManagerCallback per-process." into sc-dev 2021-08-13 12:54:27 +00:00
TreeHugger Robot
f7f061d1c5 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517 am: ed4eb3c144 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: Id51b114c739fccee0fee54eafb3970cbd3b5e3e8
 2021-08-13 03:01:56 +00:00
TreeHugger Robot
7165cc134f Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517 am: 50df41af58 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I69de9446ee2126e2e5125e37ca8c04a946c6d352
 2021-08-13 03:01:24 +00:00
TreeHugger Robot
ed4eb3c144 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I122947a6ab6001709cfb28f41c43cff90159adb3
 2021-08-13 02:46:54 +00:00
TreeHugger Robot
50df41af58 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev am: b1c1ae9517 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15388825

Change-Id: I0a7ee79b03854312fe55a0a7b7090dbb087007eb
 2021-08-13 02:46:12 +00:00
TreeHugger Robot
b1c1ae9517 Merge "Don't resume PowerStatsDataStorage read on Exception" into sc-dev 2021-08-13 02:34:36 +00:00
Bill Yi
e33efd8cbc [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 75d8c094f4 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id9fc8a744895eb57267debf43b0d9c43e16e2bb4
 2021-08-13 02:32:00 +00:00
Bill Yi
75d8c094f4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I356404526378505c5c9cce4d14cb343b19b4f4d6
 2021-08-13 02:30:36 +00:00
Bill Yi
015f5f4ac2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7e747b5f59524fd0824663d58a6645b5e3abb339
 2021-08-13 02:19:53 +00:00
Bill Yi
385c28b337 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Idb57776f61dc6d4b2862b082fdd96cc8ab0107d0
 2021-08-13 02:12:49 +00:00
Ming-Shin Lu
51b909f188 Merge "Improve shouldRestoreImeVisibility perf" into sc-qpr1-dev am: b73c29a18a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15542637

Change-Id: I92aa720e2dbfcb46ed375f60654ef766eef93819
 2021-08-13 01:41:59 +00:00
Ming-Shin Lu
b73c29a18a Merge "Improve shouldRestoreImeVisibility perf" into sc-qpr1-dev 2021-08-13 01:26:59 +00:00
Yu-Ta Lu
11ad8ac751 Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f am: c632d2f7f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: I578a9ef258734c51ee60349c7841dfaaf15c8165
 2021-08-13 01:01:39 +00:00
Mark Renouf
66aa586b4d Log additional UiEvents for long screenshots, include packageName 
Bug: 195013652
Test: atest ScrollCaptureControllerTest
Change-Id: Ief6578b33bb3361980ebd73a803a87f21f985a47
 2021-08-13 00:59:08 +00:00
Yu-Ta Lu
9574378748 Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f am: 0eb1cadad0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: I5ed4a2e3996561687684cb600080022e2eb4a423
 2021-08-13 00:56:34 +00:00
Yu-Ta Lu
c632d2f7f2 Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: Id9ce35e826965689bf836e0298fe7f08fc6775fe
 2021-08-13 00:46:37 +00:00
Yu-Ta Lu
0eb1cadad0 Merge "Replace private attributes with public resources." into sc-dev am: 9c219f140f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15522189

Change-Id: I8bd9a98142d6437dae03923ab782b2d04c2ca372
 2021-08-13 00:45:35 +00:00
Yu-Ta Lu
9c219f140f Merge "Replace private attributes with public resources." into sc-dev 2021-08-13 00:32:04 +00:00
Jooyung Han
6def53056e Merge "AIDL: use typed Map" am: 72d5595e0e am: aa0551424c am: cde3534eb1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I8d1757a5863e862e86bda0f508fce9b033b135b4
 2021-08-12 23:53:58 +00:00
Chris Li
e0b2ad8048 Merge "Fix thread safety issues;" am: a1431a8227 am: 3b65b029c5 am: c31e052182 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I9f398aea59537a5f8edaed3e524073f1ec0f77a9
 2021-08-12 23:53:37 +00:00
Jooyung Han
cde3534eb1 Merge "AIDL: use typed Map" am: 72d5595e0e am: aa0551424c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I269ec562d6e1441cdbd9ce48e8f9737d6ab3fd21
 2021-08-12 23:39:19 +00:00
Chris Li
c31e052182 Merge "Fix thread safety issues;" am: a1431a8227 am: 3b65b029c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I6bf7d4ee71d9d6a409179e440f33fc0596d84897
 2021-08-12 23:38:47 +00:00
Jooyung Han
aa0551424c Merge "AIDL: use typed Map" am: 72d5595e0e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1793486

Change-Id: I2757de388bfa22023c4a710c4677b04cd049efff
 2021-08-12 23:24:13 +00:00
Chris Li
3b65b029c5 Merge "Fix thread safety issues;" am: a1431a8227 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1791852

Change-Id: I0a21018e46acffa35c9e337b1f39d381c98a1754
 2021-08-12 23:23:56 +00:00
Joe Bolinger
07f5bb6051 Merge "Remove new task flag when launching unicorn enrollment." into sc-dev am: afe9dad1da am: dfb01e0793 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521773

Change-Id: I0aef8f2de1f437241be8052f9a552ddded0fdcd5
 2021-08-12 23:23:49 +00:00
Joe Bolinger
204cf4628d Merge "Remove new task flag when launching unicorn enrollment." into sc-dev am: afe9dad1da am: 6241cf6b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15521773

Change-Id: I26c70a535b10ca9ff35612578937caad5b4cde32
 2021-08-12 23:23:28 +00:00