Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
725,780 Commits 3 Branches 0 Tags
87585ba0fdeb889ecdd0f9c3079dcedfd10037ef
Commit Graph

725780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Pawlowski
87585ba0fd Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab am: be7af2bacb am: 48a3a95135 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: I6f8965c28b5507635a2f8bb99b5250f047d4f9c0
 2021-10-14 08:17:43 +00:00
Jakub Pawlowski
a91e4dec64 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8 am: a7d42cae3e am: d66aa55784 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I338850a251dee63c11aeca015e6d3f4b051e8e4f
 2021-10-14 08:16:32 +00:00
Jakub Pawlowski
48a3a95135 Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab am: be7af2bacb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: I71872dc73a525439e922fc5ffe2f488d152b0f6d
 2021-10-14 07:55:58 +00:00
Jakub Pawlowski
d66aa55784 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8 am: a7d42cae3e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I3c1aab5c74cc8ca90414be56d4c86daf8305d5d3
 2021-10-14 07:55:25 +00:00
Jakub Pawlowski
be7af2bacb Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de am: aa84ebeaab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: I13ede496e5c4d5f86af75a687f6460e09f30acf6
 2021-10-14 07:39:22 +00:00
Jakub Pawlowski
a7d42cae3e Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab am: 3bb83023a8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I42928af23c008faf7d3fe198d4aaa9356409af9c
 2021-10-14 07:38:54 +00:00
TreeHugger Robot
64b74d5734 Merge "Simulate extra navigation bar for fixed rotation" into sc-v2-dev am: b4fabe9b08 am: cef9ce278a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15828039

Change-Id: I72f9e9fd488cd22eaa1c61ed9f59c52e6567fb17
 2021-10-14 07:31:31 +00:00
Jakub Pawlowski
aa84ebeaab Merge changes If0e5861e,Ib385b24d am: 488d8f2060 am: b2da79c8de 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: Ibf8cd5b410535711c1f3842b02dedc7826843488
 2021-10-14 07:22:43 +00:00
Jakub Pawlowski
3bb83023a8 Merge "bluetooth: Fix common typo" am: 2f8032fd8b am: b0182963ab 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I73e4f7e156ee701c3587ef9667d6c7c03dbe8363
 2021-10-14 07:22:16 +00:00
TreeHugger Robot
cef9ce278a Merge "Simulate extra navigation bar for fixed rotation" into sc-v2-dev am: b4fabe9b08 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15828039

Change-Id: If4966c046b6e1af5753a7b0cab6b233ad9fc5f99
 2021-10-14 07:17:51 +00:00
Jakub Pawlowski
b2da79c8de Merge changes If0e5861e,Ib385b24d am: 488d8f2060 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856318

Change-Id: Iea74610f3437640b40ea716bfc9b52d8b466bb45
 2021-10-14 07:14:39 +00:00
Jakub Pawlowski
b0182963ab Merge "bluetooth: Fix common typo" am: 2f8032fd8b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856317

Change-Id: I52f56b11ddc93ba2fce742f970704cbf26807a28
 2021-10-14 07:13:47 +00:00
TreeHugger Robot
b4fabe9b08 Merge "Simulate extra navigation bar for fixed rotation" into sc-v2-dev 2021-10-14 07:03:38 +00:00
Jakub Pawlowski
488d8f2060 Merge changes If0e5861e,Ib385b24d 
* changes:
  leaudio: Add missing context types
  leaudio: Add API to add/remove group node
 2021-10-14 07:03:31 +00:00
Jakub Pawlowski
2f8032fd8b Merge "bluetooth: Fix common typo" 2021-10-14 06:59:51 +00:00
Ming-Shin Lu
b0e40f36b2 Merge "Fix IME crash on SoftInputWindow.show by TOKEN_PENDING" 2021-10-14 04:33:35 +00:00
Ashwini Oruganti
2417a8a446 Merge "Update the BroadcastQueue logic for runtime permissions" 2021-10-14 02:51:22 +00:00
Tyler Gunn
6dc43a11fa Merge "Update call log provider docs to clarify how to use LIMIT." am: 5563f3ad03 am: 647ac1a233 am: 40f4b45d61 am: 8a9f751940 am: 9624f6844b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852925

Change-Id: Idfa2b501339d2cf7354598df7e46d4294a2bb626
 2021-10-14 02:22:22 +00:00
Tyler Gunn
9624f6844b Merge "Update call log provider docs to clarify how to use LIMIT." am: 5563f3ad03 am: 647ac1a233 am: 40f4b45d61 am: 8a9f751940 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852925

Change-Id: Icd763b868cddf8b049efed9635548957ba16f944
 2021-10-14 02:05:38 +00:00
Tyler Gunn
8a9f751940 Merge "Update call log provider docs to clarify how to use LIMIT." am: 5563f3ad03 am: 647ac1a233 am: 40f4b45d61 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852925

Change-Id: I94cceaa092465b3e273c9d3889cd53d30c0bdde8
 2021-10-14 01:52:59 +00:00
Tyler Gunn
40f4b45d61 Merge "Update call log provider docs to clarify how to use LIMIT." am: 5563f3ad03 am: 647ac1a233 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852925

Change-Id: I8a3c4e109195f4133efa42722f8b6883dc798adf
 2021-10-14 01:37:39 +00:00
Tyler Gunn
647ac1a233 Merge "Update call log provider docs to clarify how to use LIMIT." am: 5563f3ad03 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1852925

Change-Id: Ia91c02202f74793f22a9631664fe7527f931d83a
 2021-10-14 01:22:43 +00:00
Tyler Gunn
5563f3ad03 Merge "Update call log provider docs to clarify how to use LIMIT." 2021-10-14 01:11:27 +00:00
Alexander Dorokhine
e1548a4e81 Merge "Remove references to AppSearch from removed test suites." 2021-10-13 23:55:32 +00:00
Jakub Pawlowski
de532011f4 Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc am: 6f82402e5c am: 1351cc0cc4 am: f4a361baca 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: Iea0e156841d33af3aac63f27f8055bd021beb288
 2021-10-13 23:11:31 +00:00
Emilian Peev
1a8d5596eb Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev am: a8a33c88f2 am: 24a011273a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16034842

Change-Id: Id0b8d3ed9acdc0e70dd82d78fca964309f75b53f
 2021-10-13 23:10:20 +00:00
Emilian Peev
80fe361c85 Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev am: cd056ddbb8 am: bd25a442f1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16042088

Change-Id: I61ddc76a783a7e72e7012989a4dd54b8d081af16
 2021-10-13 23:09:27 +00:00
Jakub Pawlowski
f4a361baca Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc am: 6f82402e5c am: 1351cc0cc4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I7ed2f59927cf428e4ed2f8b527cb41cec8759a60
 2021-10-13 23:04:07 +00:00
Emilian Peev
24a011273a Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev am: a8a33c88f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16034842

Change-Id: Id89389ee1e346c6ea994331f233f73de17ae968c
 2021-10-13 22:56:43 +00:00
Emilian Peev
bd25a442f1 Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev am: cd056ddbb8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16042088

Change-Id: I8269adbd3cc7542199ad27718bc46a311d57709e
 2021-10-13 22:55:55 +00:00
Jakub Pawlowski
1351cc0cc4 Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc am: 6f82402e5c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I87440b20d13344d77d0b3f23f9e70c2073185b4e
 2021-10-13 22:48:51 +00:00
Emilian Peev
a8a33c88f2 Merge "Camera: Handle ISE when device state manager is absent" into sc-v2-dev 2021-10-13 22:42:18 +00:00
Emilian Peev
cd056ddbb8 Merge "Camera: Rename DeviceStateOrientationMap" into sc-v2-dev 2021-10-13 22:40:46 +00:00
Jakub Pawlowski
6f82402e5c Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 am: b77335b8fc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I9fc8afb137b57f890655fa6ce9254a4e39375110
 2021-10-13 22:37:03 +00:00
Jakub Pawlowski
b77335b8fc Merge "bluetoothUuid: Add placeholder for CAP uuid" am: 948f5cc547 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856322

Change-Id: I98cb11690fe5c3decfd9b9b0118d87635f7a0873
 2021-10-13 22:22:45 +00:00
Jakub Pawlowski
948f5cc547 Merge "bluetoothUuid: Add placeholder for CAP uuid" 2021-10-13 22:08:07 +00:00
Grzegorz Kołodziejczyk
b92392dff9 leaudio: Add missing context types 
BYPASS_INCLUSIVE_LANGUAGE_REASON=exact wording for constant from BT specification
Bug: 150670922
Tag: #feature
Sponsor: jpawlowski@
Test: compile
Change-Id: If0e5861e882636afba6a29c0ae34362d179035ea
 2021-10-13 21:59:29 +00:00
John Wu
f4d4d89a67 Merge "Support system app update leaving shared UID then getting uninstalled" 2021-10-13 21:50:18 +00:00
John Wu
d8597aa9a5 Support system app update leaving shared UID then getting uninstalled 
It is possible for a system app to leave shared user ID by an update. We
need to keep track of this in case the upgrade is uninstalled. In this
scenario, the shadowed system package will be reinstalled using the
original shared UID. This has the side effect of the app ID used by the
shared user group being held forever even if no apps is actively using
it, because only the app ID is stored in packages.xml, not the
sharedUserId name, and we have to use the app ID to link the disabled
PackageSetting with the corresponding SharedUserSetting.

Test: tracking with b/202993696
Bug: 179284822
Fixes: 201509122
Change-Id: If48aeb7d63daf1ef8bdf06a9d2dd34c1de8603c8
 2021-10-13 21:46:22 +00:00
Terry Wang
c67f8fa55b [automerger skipped] Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev am: 4da674b517 -s ours am: 569cbb8d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic36751014edd3152edc1a5d8dafb0b28e9926504
 2021-10-13 21:43:14 +00:00
Lucas Dupin
a7f28b8089 Merge "Do not inflate lottie animation when not needed" into sc-v2-dev am: ef85bbb892 am: 1dcb8e8763 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16043016

Change-Id: I5b012791fac1ca59cbc3cd1a3126aa13d824bf0c
 2021-10-13 21:42:05 +00:00
Jordan Liu
db69d3ebef Merge "Remove sdk28 tests from presubmit" 2021-10-13 21:31:03 +00:00
Terry Wang
569cbb8d4e [automerger skipped] Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev am: 4da674b517 -s ours 
am skip reason: Merged-In I38469ad5df100e90aba81bbdc82078b568301f09 with SHA-1 0b488bfdb2 is already in history

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

Change-Id: I6d53dbe5d7e860b4f4551f22bbcac099abb8fdea
 2021-10-13 21:25:39 +00:00
Ashwini Oruganti
1e6a968126 Update the BroadcastQueue logic for runtime permissions 
Previously, we were skipping a broadcast when either the permission or
the app op was granted. However, for runtime permissions to be
considered "granted" both the permission and the app op need to be
granted. This change updates taking this into account.

Test: manual
Bug: 202436287
Bug: 183537857
Change-Id: I9f12f9e17e61246d723d18ead93c6115bbf6d5cf
 2021-10-13 14:24:42 -07:00
Lucas Dupin
1dcb8e8763 Merge "Do not inflate lottie animation when not needed" into sc-v2-dev am: ef85bbb892 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16043016

Change-Id: Iaabc833a6da27e66d2ff6a111e514854136b2e0f
 2021-10-13 21:23:07 +00:00
Terry Wang
4da674b517 Merge "DO NOT MERGE: Revert "Enable cross-user requests."" into sc-v2-dev 2021-10-13 21:17:30 +00:00
Lucas Dupin
ef85bbb892 Merge "Do not inflate lottie animation when not needed" into sc-v2-dev 2021-10-13 21:13:14 +00:00
Julia Reynolds
f01bf6d8bf Merge "Fix incorrect documentation" into sc-v2-dev am: 64ef6abce8 am: 89dac6d111 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949163

Change-Id: I11c6dc3bbf60341e6d886c19adbaf7298eea2a4c
 2021-10-13 21:02:03 +00:00
Julia Reynolds
89dac6d111 Merge "Fix incorrect documentation" into sc-v2-dev am: 64ef6abce8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15949163

Change-Id: I72c5b935b609b11c3b1ac3e1051537c9c6ae0876
 2021-10-13 20:51:59 +00:00
Julia Reynolds
64ef6abce8 Merge "Fix incorrect documentation" into sc-v2-dev 2021-10-13 20:39:39 +00:00