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

643574 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Steve Elliott
33f8e11606 Merge "Add callbacks for bouncer keyguard reset" into sc-dev 2021-06-09 18:26:41 +00:00
Matt Pietal
68db245507 Merge "Controls spacing" into sc-dev 2021-06-09 18:18:44 +00:00
Ying Xu
0732d74669 Merge "Only update Carrier Merged WiFi state if it is default" into sc-dev 2021-06-09 18:13:15 +00:00
Anna Zappone
d8b5c05ff1 Merge "Fix LTR & conversation updates on main thread" into sc-dev 2021-06-09 17:58:12 +00:00
Tej Singh
af533b33b1 [automerger skipped] [RESTRICT AUTOMERGE] Fix OOB write in noteAtomLogged am: 7f9b0a9fb0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25f81cbc3411addb6d5a329db983ad8324e44c7a
 2021-06-09 17:57:23 +00:00
Mady Mellor
fd4a4a3ee5 Merge "Collapse the stack on clicks rather than on down" into sc-dev 2021-06-09 17:46:55 +00:00
Winson Chung
24de1aa861 Merge "Fix for IME exclusions not working with expanded bubble" into sc-dev 2021-06-09 17:35:35 +00:00
Winson Chung
9f6c43e65c Fix for IME exclusions not working with expanded bubble 
- Technically the IME window is above the Bubble window, but when
  traversing the windows top-down for calculating the final exclusion
  region for SysUI, the IME is placed just above its target (the
  embedded task), and the Bubble's full touchable region effectively
  overrides the IME's requested exclusion region

Fixes: 190338512
Test: Expand a bubble, swipe from IME edge
Change-Id: Idd71eabfaba1be4bc6fc90d09db28d3f9e9106c5
 2021-06-09 17:34:58 +00:00
Julia Reynolds
b87598c3cc Merge "Update logic about parent and convo channels" into sc-dev 2021-06-09 17:33:23 +00:00
TreeHugger Robot
57fcc33111 Merge "Give shell android.permission.GET_TOP_ACTIVITY_INFO" into sc-dev 2021-06-09 17:15:44 +00:00
TreeHugger Robot
aea3115776 Merge "Proper retrying DL installation sessions." into sc-dev 2021-06-09 17:02:54 +00:00
TreeHugger Robot
900834f728 Merge "Take a screenshot as soon as the phone unlocks" into sc-dev 2021-06-09 17:01:24 +00:00
Amith Yamasani
da4a48d027 Merge "Only create app data for installed apps for new user" into sc-dev 2021-06-09 16:57:23 +00:00
TreeHugger Robot
f9cd67b01e Merge "Avoid potential deadlock" into sc-dev 2021-06-09 16:51:44 +00:00
Riddle Hsu
7f38c6c3a4 Merge "Fix inverted vertical offset of entering rotated PiP" into sc-dev 2021-06-09 16:51:34 +00:00
TreeHugger Robot
3009984d65 Merge "Make ContentCapture event contains parcelable span" into sc-dev 2021-06-09 16:48:55 +00:00
Mark Renouf
886b1a3d7c ScrollCaptureTarget: enforce argument nullability in ctor 
Bug: 180419562
Test: atest ScrollCaptureTargetTest
Change-Id: I390269c8cfc0ce57c5cf9b58ad0cbf75a0281b00
 2021-06-09 16:48:26 +00:00
TYM Tsai
b8fc743699 Make ContentCapture event contains parcelable span 
The spans were removed by ag/13819626. Adds them back into the
ContentCaptureEvent. And removes unnecessary Map data because we
can get it via travel events. The total of events is not large.

Bug: 190035037
Bug: 184311217
Test: atest CtsContentCaptureServiceTestCases
Test: atest FrameworksCoreTests:ContentCaptureEventTest
Change-Id: I5fa1f7a6b51fd050a63731543cca98972c294b22
 2021-06-09 16:48:23 +00:00
Ryan Mitchell
015bca79f4 Merge changes I2710cfea,I03fb31ee,Iec512b31 into sc-dev 
* changes:
  ResourcesImpl.ThemeImpl NativeAllocationRegistry
  Rebase ThemeImpl rather than reallocate memory
  Sparse native theme representation
 2021-06-09 16:35:35 +00:00
Rubin Xu
b9be267361 Merge "Allow any apps to call DPM.isUsbDataSignalingEnabled()" into sc-dev 2021-06-09 15:54:21 +00:00
Stevie Kideckel
0e77904b02 Merge "Fix handling for onItemClick of fixed collection items" into sc-dev 2021-06-09 15:53:30 +00:00
Lucas Dupin
db68ba557b Merge "New blur radius and wallpaper zoom" into sc-dev 2021-06-09 15:32:34 +00:00
Steve Elliott
245530b828 Add callbacks for bouncer keyguard reset 
Test: manual, mp, atest
Bug: 189468877
Change-Id: I0add1c570461a4ed99f48803800e86edcdfe5e99
 2021-06-09 11:30:35 -04:00
Beth Thibodeau
cdbc555a0b Merge "Handle media load events while testing for resume" into sc-dev 2021-06-09 15:06:36 +00:00
Julia Reynolds
99a5975af8 Update logic about parent and convo channels 
To handle the case where an app sends a notification directly
to a custom channel, and to properly show priority markings
on conversation tiles

Test: atest; manually ensure convo tiles are marked as priority
Fixes: 184709662
Change-Id: I8f9b6169943da5670bc09fd16bbe692fd43d2cf6
 2021-06-09 14:28:17 +00:00
Matt Casey
894c5d3d73 Merge "Request scroll capture when the screen rotates." into sc-dev 2021-06-09 13:16:39 +00:00
Matt Pietal
b8daba75e7 Controls spacing 
The last row may contain spacers, but these also need the correct
margins so all controls retain the same dimensions.

Fixes: 190089614
Test: manual (controls main activity + add/edit controls)
Change-Id: Ie19b98405213bc0f9ef53a11f44cb8013139e562
 2021-06-09 08:46:37 -04:00
TreeHugger Robot
97be319829 Merge "Called onError() when HotwordDetectionService process died" into sc-dev 2021-06-09 11:16:32 +00:00
TreeHugger Robot
e249d3499d [automerger skipped] Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40 am: 9aefabdafd -s ours 
am skip reason: Merged-In I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 with SHA-1 1ea98d4449 is already in history

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

Change-Id: Iaa4cd288a55b6473dcc4276cdf9fbd40af0451be
 2021-06-09 10:54:25 +00:00
TreeHugger Robot
f1b89ae4be [automerger skipped] Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40 am: 92f9646d63 -s ours 
am skip reason: Merged-In I93aea7cd5d3b7befea1f78e1cf3f31f8250f1d33 with SHA-1 9d508579ae is already in history

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

Change-Id: I6cea0f68b04d19724af1a559ddfb60a9a2560d50
 2021-06-09 10:53:47 +00:00
Mariia Sandrikova
b3a96f3cc1 Merge "Don't shown letterbox surfaces unless activity is visible." into sc-dev 2021-06-09 10:44:35 +00:00
TreeHugger Robot
9aefabdafd Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14800511

Change-Id: Ied6b2e6c4efb41895a0280c770a0e49b5e0bd40f
 2021-06-09 10:41:16 +00:00
TreeHugger Robot
92f9646d63 Merge "Block SAF directory access to /sdcard/Android" into rvc-dev am: 246b270b40 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14800511

Change-Id: I10cecf779b554721aa09a60d664b115283ca922e
 2021-06-09 10:40:45 +00:00