Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
679,273 Commits 3 Branches 0 Tags
e10f844c5962821583799c7e2151d84ea7967006
Commit Graph

679273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oliver Woodman
e10f844c59 [automerger skipped] Re-enable volume control for non-grouped devices am: b7f52f4468 am: 5f9c21209d -s ours am: e4abc3a97a -s ours 
am skip reason: Merged-In I7740d78f3a7dca62d64e6cf7b8c9ffa1578c8e74 with SHA-1 f68e7fb489 is already in history

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

Change-Id: I6d347139141cb382ffc2ba1e587c3ea5265e7d45
 2021-11-22 21:25:51 +00:00
Oliver Woodman
a15da1ec2a [automerger skipped] Tweak volume adjustment rules am: 022081595b am: 904dd271b9 -s ours am: 1c6275b133 -s ours 
am skip reason: Merged-In If531a23f5e7b242d3d637966b74b67acfd303199 with SHA-1 aa9dc925f8 is already in history

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

Change-Id: Iebf3b711d7bb8205527edcd17eee5b78f91ed06c
 2021-11-22 21:25:33 +00:00
Oliver Woodman
0580879867 [automerger skipped] Merge "Fix SysUI volume controls not appearing" into sc-dev am: adc5f9571f am: 66ad53f958 am: d0bce501c6 -s ours 
am skip reason: Merged-In Ic44b48bb5605699b476af05407b90f2be5d70cd3 with SHA-1 8907455ed7 is already in history

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

Change-Id: Id0289092b2ee6615b907083d8beb104844d3cea4
 2021-11-22 21:25:14 +00:00
Oliver Woodman
1fd7240719 [automerger skipped] Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba18 am: 3a9f146f3b am: 59c6401d0b -s ours 
am skip reason: Merged-In I71d7f11b9d88dfb9ef74814e9ac7f9d28b0e652c with SHA-1 0657b28b24 is already in history

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

Change-Id: Ib77ca69876262d0b1de6ffd1d98a7a23a23c2b44
 2021-11-22 21:25:11 +00:00
Oliver Woodman
2d15f9d584 [automerger skipped] Re-enable volume control for non-grouped devices am: b7f52f4468 am: 5f9c21209d am: dba11591b9 -s ours 
am skip reason: Merged-In I7740d78f3a7dca62d64e6cf7b8c9ffa1578c8e74 with SHA-1 f68e7fb489 is already in history

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

Change-Id: Ic96eedc687d92ce967ca75734facc4aa8a0c3064
 2021-11-22 21:25:09 +00:00
Oliver Woodman
8b94a8b3d2 [automerger skipped] Tweak volume adjustment rules am: 022081595b am: 904dd271b9 am: ee9ff19392 -s ours 
am skip reason: Merged-In If531a23f5e7b242d3d637966b74b67acfd303199 with SHA-1 aa9dc925f8 is already in history

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

Change-Id: Id38235f0d7536dea176abfe0ae08a607408d1568
 2021-11-22 21:24:57 +00:00
Oliver Woodman
d0bce501c6 Merge "Fix SysUI volume controls not appearing" into sc-dev am: adc5f9571f am: 66ad53f958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16286398

Change-Id: If987800466c4f267ff09884f6452f673a7b9bd82
 2021-11-22 21:09:59 +00:00
Oliver Woodman
e4abc3a97a [automerger skipped] Re-enable volume control for non-grouped devices am: b7f52f4468 am: 5f9c21209d -s ours 
am skip reason: Merged-In I7740d78f3a7dca62d64e6cf7b8c9ffa1578c8e74 with SHA-1 f68e7fb489 is already in history

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

Change-Id: I432159523320fc31b8926114a1b07d76a9895d9a
 2021-11-22 21:09:41 +00:00
Oliver Woodman
59c6401d0b Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba18 am: 3a9f146f3b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16233501

Change-Id: I31b7358e01171cba241d0a3bf0489fdc77cb4ca3
 2021-11-22 21:09:39 +00:00
Oliver Woodman
1c6275b133 [automerger skipped] Tweak volume adjustment rules am: 022081595b am: 904dd271b9 -s ours 
am skip reason: Merged-In If531a23f5e7b242d3d637966b74b67acfd303199 with SHA-1 aa9dc925f8 is already in history

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

Change-Id: I345f1d230b15b5a656af33c461380e09b86422b1
 2021-11-22 21:09:38 +00:00
Oliver Woodman
dba11591b9 Re-enable volume control for non-grouped devices am: b7f52f4468 am: 5f9c21209d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214442

Change-Id: I6790f94cf33ca431a2724023ca4c87b44be5cabb
 2021-11-22 21:09:30 +00:00
Oliver Woodman
ee9ff19392 Tweak volume adjustment rules am: 022081595b am: 904dd271b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16220980

Change-Id: I0fe26887ea12a70faf6efe317910914b1ef1299e
 2021-11-22 21:09:18 +00:00
Oliver Woodman
66ad53f958 Merge "Fix SysUI volume controls not appearing" into sc-dev am: adc5f9571f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16286398

Change-Id: I4d0e2424f8d41ebb34bd942ed46140bbb47e6c3b
 2021-11-22 20:53:19 +00:00
Oliver Woodman
3a9f146f3b Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba18 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16233501

Change-Id: I5564bb02f360342c0f8338f31069fa70e503c342
 2021-11-22 20:53:16 +00:00
Oliver Woodman
5f9c21209d Re-enable volume control for non-grouped devices am: b7f52f4468 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16214442

Change-Id: Ie40fe5967a1c2745e0fb7f7a21fb9c61effc9c56
 2021-11-22 20:53:14 +00:00
Oliver Woodman
904dd271b9 Tweak volume adjustment rules am: 022081595b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16220980

Change-Id: Idfb22f293efc840e856615f6f065a535d0e5fcaf
 2021-11-22 20:53:12 +00:00
Oliver Woodman
adc5f9571f Merge "Fix SysUI volume controls not appearing" into sc-dev 2021-11-22 20:33:14 +00:00
Oliver Woodman
e65fa2ba18 Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev 
* changes:
  Plumb config to output switcher indication chip
  Re-enable volume control for non-grouped devices
  Tweak volume adjustment rules
 2021-11-22 20:33:14 +00:00
Fabian Kozynski
87854d4d18 Merge "[DO NOT MERGE] Add animation for Dnd dialog" into sc-v2-dev am: 8a05667f8c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16265468

Change-Id: I355d4cbc8c7f584c17f7707cde5f0e21c58ceef2
 2021-11-22 20:31:54 +00:00
Fabian Kozynski
d03df58d32 [DO NOT MERGE] Add animation for Dnd dialog am: 9ac796de8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16265468

Change-Id: I68609c1e4fbe0ddcb6fb0b6f6b9df02075179684
 2021-11-22 20:31:39 +00:00
Fabian Kozynski
8a05667f8c Merge "[DO NOT MERGE] Add animation for Dnd dialog" into sc-v2-dev 2021-11-22 19:53:07 +00:00
Winson Chung
6fafaf441a Merge "Prevent recomputeDisableFlags from clobbering the system disable flags" into sc-v2-dev am: 27cef855be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16307531

Change-Id: I20caa75865ea35c6a8a07f4fe254051b59187a9b
 2021-11-22 17:37:29 +00:00
Beverly Tai
42f22a8377 Merge "Show bouncer after failed UDFPS attempts" into sc-v2-dev am: dd9f25b195 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306818

Change-Id: Id09b128a3ab944a11c2c9a96d69c05df5db957e7
 2021-11-22 17:36:15 +00:00
Winson Chung
27cef855be Merge "Prevent recomputeDisableFlags from clobbering the system disable flags" into sc-v2-dev 2021-11-22 17:27:31 +00:00
Winson Chung
7567f970d6 Prevent recomputeDisableFlags from clobbering the system disable flags 
- The disable() call on the binder thread can race with this call on
  the main thread due to this 1) fetching the old values on the main
  thread, then 2) trying to synchronize on mLock by calling disable()
  (which the binder thread is currently holding) and then 3) applying
  the previous flags immediately after the fresh disable flags are set
  by the binder call.

Bug: 205921118
Test: atest SystemUITests
Change-Id: I5dd4d2d248b6c1ab6d1677e2bb915100cd3e4f4e
 2021-11-22 17:27:22 +00:00
Beverly Tai
dd9f25b195 Merge "Show bouncer after failed UDFPS attempts" into sc-v2-dev 2021-11-22 17:17:30 +00:00
Jon Eckenrode
75954281b3 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4 am: abce82bc5d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: Ib93e924bc133945c119e1bdac7c6ecb643b80a7e
 2021-11-22 17:07:17 +00:00
Jon Eckenrode
abce82bc5d Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 am: 98951a99f4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: Icb9a08416599e1dcad31e146a2b8f82bb1ef8281
 2021-11-22 16:50:58 +00:00
Jon Eckenrode
98951a99f4 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." am: 92a4b54de5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1882528

Change-Id: I894941a064dc61c68722036081f0617c47804c83
 2021-11-22 16:38:54 +00:00
Jon Eckenrode
92a4b54de5 Merge "Reconciled description of WindowManager with description of Context#createDisplayContext()." 2021-11-22 16:21:19 +00:00
Alice Kuo
409c4af111 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d am: cc70fa74f1 am: 2790076272 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I13eb4dc6c3a7db16e5377bd92be004a8e0b2f0e1
 2021-11-22 15:11:37 +00:00
Alice Kuo
2790076272 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d am: cc70fa74f1 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: Ifd8991742a362fb32aef8019d667641483323961
 2021-11-22 14:48:01 +00:00
Fabian Kozynski
9ac796de8d [DO NOT MERGE] Add animation for Dnd dialog 
Also, use SystemUI dialog theme.

Test: manual
Test: atest DndTileTest
Fixes: 206454318
Fixes: 206730944
Change-Id: I599935e28ab6d6f6ad1fa497f4eeea652b74dad6
 2021-11-22 09:40:08 -05:00
Alice Kuo
cc70fa74f1 Merge "Fix settingLib couldn't receive the broadcast issue." am: b29c718a9d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1895047

Change-Id: I6ac7d5b9794eef7581373003960a5009a381cd97
 2021-11-22 14:36:23 +00:00
Alice Kuo
b29c718a9d Merge "Fix settingLib couldn't receive the broadcast issue." 2021-11-22 14:16:31 +00:00
Alan Stokes
94303f51cd Merge "Add Isolated Compilation service" am: e53d334d7f am: 1fa4b81f7f am: dee9164c6f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: Ida1a1bf276139accde99522e408b5d19ae884d30
 2021-11-22 12:04:12 +00:00
Alan Stokes
dee9164c6f Merge "Add Isolated Compilation service" am: e53d334d7f am: 1fa4b81f7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: I45d3c726a18b4ed6c5845390ab9c5ad2d938419c
 2021-11-22 11:48:07 +00:00
Alan Stokes
1fa4b81f7f Merge "Add Isolated Compilation service" am: e53d334d7f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1892635

Change-Id: I8172f13d2bd6a1dde33c26400989126bd69a5285
 2021-11-22 11:35:57 +00:00
Jack Yu
c4fadacbdb Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a am: 4d3b2b227c 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: Ie8a7dd3cf1d525e22f430beaea95e85c7fc62ce9
 2021-11-22 11:23:29 +00:00
Alan Stokes
e53d334d7f Merge "Add Isolated Compilation service" 2021-11-22 11:17:38 +00:00
Jack Yu
4d3b2b227c Merge changes from topic "nfc_workprofile" am: 2740c2f009 am: 3fd3a6579a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: I940e84e73a065e534e5ace8430b347f71cc016e1
 2021-11-22 11:12:20 +00:00
Jack Yu
3fd3a6579a Merge changes from topic "nfc_workprofile" am: 2740c2f009 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856335

Change-Id: If86eaccf96acc4b1135b8795ec1b2d86c28fa148
 2021-11-22 11:00:17 +00:00
Jack Yu
2740c2f009 Merge changes from topic "nfc_workprofile" 
* changes:
  NFC support in work profile
  NFC support in work profile
 2021-11-22 10:45:44 +00:00
Alice Kuo
f634234fca Fix settingLib couldn't receive the broadcast issue. 
Bug: 207311784
Test: scan device normal
Change-Id: I3bb628871b4921f87c92e03386bcb6f66d90ae9f
 2021-11-22 18:13:14 +08:00
Chris Li
c999171b48 Merge "Fix security bug for TaskFragment creation" into sc-v2-dev am: 5b9b66e85d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16280766

Change-Id: Ic8d56fd36296c031381e3726b5b8915c98ed5e7d
 2021-11-22 07:00:05 +00:00
Chris Li
5b9b66e85d Merge "Fix security bug for TaskFragment creation" into sc-v2-dev 2021-11-22 06:46:06 +00:00
Remi NGUYEN VAN
df6f4dbd11 Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce am: 257dba0544 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: Icb73c93454669e198b557ca13432cb93ff88256a
 2021-11-22 06:45:59 +00:00
Charles Chen
ce8201895b Merge "[RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent" into sc-v2-dev am: 83d6490629 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16259164

Change-Id: I308b1e892888bf0d117c0a96e3878880b9691b84
 2021-11-22 06:43:07 +00:00
Charles Chen
cb89941f83 [RESTRICT AUTOMERGE] Associate SystemUiContext with DisplayContent am: 082403816a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16259164

Change-Id: I5f4fa53bdd66b01d491a7c1ac6dbac1e8ce2bc9e
 2021-11-22 06:42:43 +00:00
Remi NGUYEN VAN
257dba0544 Merge "Remove AsyncChannel usage in NsdManager" am: d627d9b1ba am: f62d2629ce 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1823015

Change-Id: I9a83de60e0ff61c0cc41daba65568c944f15d7f7
 2021-11-22 06:35:27 +00:00