Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
805,123 Commits 3 Branches 0 Tags
bcadfd2476b50ee19f514b58cccb8a6a63cd4cc8
Commit Graph

5555 Commits

Author SHA1 Message Date
TreeHugger Robot
17c48787bc Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 am: 1ba0219c95 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: Iae9f0c2a69c1644a64e28fce1827c5459a66f32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:30:53 +00:00
TreeHugger Robot
aedd857b68 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev 2022-06-03 17:59:53 +00:00
Sally Qi
8893a3b626 Add Depth into DataSpace API. 
Bug: 205034862
Test: builds
Change-Id: Ie859fc46a553df03819250f9f7f8408bbacc43f2
 2022-06-02 12:55:49 -07:00
Sally Qi
e51d2fa4e7 Merge "Add DATASPACE_BT2020_HLG into DataSpace API." 2022-06-02 19:28:33 +00:00
Sally Qi
6541a05325 Add DATASPACE_BT2020_HLG into DataSpace API. 
Bug: 231727035
Test: builds
Change-Id: Ie2f5f61f2bda3bfb5bf02a2bb91d5e14d931aabf
 2022-06-01 18:49:51 -07:00
Lei Ju
acd7649901 Add nanoapp messasge records into dump. 
Test: manually run `adb shell dumpsys contexthub` and GTS test
ContextHubSendMessageToHostNanoAppTest. Pass.
Bug: 233889535

Change-Id: Icf46a0de8714343efeb605ee80777b85cfa14414
 2022-06-01 15:28:04 -07:00
Antony Sargent
6bd3385f2d Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: e81140f065 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: I6d3c6ed0afba23492d3c9481777156be6e3872d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:58:35 +00:00
Antony Sargent
725dad7d71 Prevent deadlocks during VirtualDisplay creation 
When creating a VirtualDisplay for a VirtualDevice, we need to do some
extra work like setting up for input injection, creating a
DisplayWindowPolicyController, and grabbing a wakelock to keep the
display awake. Some parts of this extra work end up calling back into
the DisplayManagerService from another thread, but since we're already
holding the mSyncRoot lock we sometimes get into situations where
those threads get blocked trying to acquire mSyncRoot, while holding a
lock that another thread ends up needing like the global window
manager one, so we get deadlock.

The fix in this CL is to break up the extra work the
VirtualDeviceManagerService needs to do into two parts: one part that
happens before the VirtualDisplay is created, and one part
after. Neither of these needs mSyncRoot to be held.

Fixes: 230544802
Test: atest CreateVirtualDisplayTest
Change-Id: I6a6e03f816567579510b3f1ef0705375549a3c88
 2022-05-29 11:18:36 -07:00
Santos Cordon
1fe8fe5b7b Logging for DisplayPowerController SuspendBlockers 
Bug: 213407479
Test: Manually verify via 'adb shell dumpsys display'
Change-Id: I2948319fc0354adf6e25b30ca11654c368c1e1d5
 2022-05-28 17:13:20 +00:00
TreeHugger Robot
cbefd0a986 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: c8571df946 am: 560421a8c0 am: e697c9bff5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: I3b98ae91030f27a529a362e418438bb613bfa451
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 04:19:41 +00:00
TreeHugger Robot
e697c9bff5 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: c8571df946 am: 560421a8c0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: I03a38e69b50086ec08ba7f930b27fb2e05e520a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:55:20 +00:00
TreeHugger Robot
560421a8c0 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 am: c8571df946 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: Ia5e508629fb4aba9d7ce60287e0f2d627b0e9a63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:19:29 +00:00
TreeHugger Robot
c8571df946 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev am: d5b0c3f163 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18488313

Change-Id: I7d8ed0e3dd91a8c0bd54868de5333f63d2268fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:01:12 +00:00
TreeHugger Robot
d5b0c3f163 Merge "Add ALL_INCLUDING_DISPLAYS category for getDisplays()" into tm-dev 2022-05-25 02:40:34 +00:00
Emilian Peev
9d8ea2b58a Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a am: be108d910c am: adbbd77689 am: ada74df7f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: Ic47bd8aec0700a649ec567ac4cef4eaecb69c146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 23:13:51 +00:00
Emilian Peev
ada74df7f7 Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a am: be108d910c am: adbbd77689 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: Id552a002d26a536dcb861b8428f35473cb8f0249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:44:02 +00:00
Emilian Peev
adbbd77689 Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a am: be108d910c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: I7685cd04307f866112cebf60d31da7f1d26d490c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:35:11 +00:00
Emilian Peev
be108d910c Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev am: f25e9aec2a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18192278

Change-Id: I7d72a960a3ef9480f2d357aac08d54e6aed4422f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:25:30 +00:00
Emilian Peev
f25e9aec2a Merge "Camera: Pass shared outputs during advanced extension configuration" into tm-dev 2022-05-24 22:20:42 +00:00
Santos Cordon
3be5498e61 Add ALL_INCLUDING_DISPLAYS category for getDisplays() 
Add a category for DisplayManager#getDisplays() that includes
disabled/inaccessible/temporary displays in the set of returned
Displays.

Bug: 221071695
Test: adb shell cmd display get-displays \
      android.hardware.display.category.ALL_INCLUDING_DISABLED
Change-Id: If06f7f8b7f9ba4779a19d24d76fb49e95a908afc
 2022-05-20 11:27:45 +00:00
TreeHugger Robot
9442ae575c Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f am: 95512285b0 am: 28e5984bac am: 6f959a3c81 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: If7939c9205fb33a825dad9600f44f23866695f22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 13:26:13 +00:00
TreeHugger Robot
6f959a3c81 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f am: 95512285b0 am: 28e5984bac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: I69647027bc37088a6617155e1a96f9d8edc64978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 13:09:02 +00:00
TreeHugger Robot
f5a4b7fd86 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f am: 02afba9572 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: I4e7280b4493b9f602e5469125302dbe2dc596978
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:50:52 +00:00
TreeHugger Robot
28e5984bac Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f am: 95512285b0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: I8cc36fad412ebf575b3ae06324e67ac61b25b284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:41:44 +00:00
TreeHugger Robot
02afba9572 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: Ie13675a43f0ddf29f926292fb2813508d890b583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:24:55 +00:00
TreeHugger Robot
95512285b0 Merge "Defines flag to disable touch feedback on display" into tm-dev am: beddca329f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17607970

Change-Id: Ic76837b9790e2b70e27007135172d4507011b9f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-19 12:23:23 +00:00
yuanjiahsu
fc06fc5cb1 Defines flag to disable touch feedback on display 
Define FLAG_TOUCH_FEEDBACK_DISABLED to disable touch sound and haptic feedback when creating virtual display.

Bug: 185558698
Test: atest FrameworksCoreTests:ViewRootImplTest, manual testing
Change-Id: Ida67f4027f2636e004218595b3bf088c06194522
 2022-05-19 06:01:55 +00:00
Automerger Merge Worker
0e48745684 Merge "Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 am: 709a36c947" into tm-d1-dev-plus-aosp am: d183441ace am: e599627a01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: Idf9f6cd7210b8ac403fec47c96b90b410b612a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 23:59:34 +00:00
Automerger Merge Worker
e599627a01 Merge "Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 am: 709a36c947" into tm-d1-dev-plus-aosp am: d183441ace 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: Ie09a48f7bf8093801fdd2474f71261cdfa950c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:16:07 +00:00
TreeHugger Robot
f3b2486f1d Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 am: 936834e3b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: I44df8872c2032b93612b4ece954335f39b0aa623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 22:15:19 +00:00
TreeHugger Robot
f6959a5796 Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 am: 709a36c947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: I1883b3123ca015616b8ca64b0208dd1ebd5f7c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:54:07 +00:00
TreeHugger Robot
709a36c947 Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: I2db75ff9724fa95fe1a52c8c1093641faae6b9aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:36:39 +00:00
TreeHugger Robot
936834e3b5 Merge "Camera: Add videoStabilizationMode to Camera session stats" into tm-dev am: ed57953565 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18376844

Change-Id: If1a8c3eccb6676f891a7e8742b49aacdaccfddb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 21:33:08 +00:00
Treehugger Robot
1e7859879d Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf am: 8992cd567f am: e2754a0ede am: 36233bdf3a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I576b816a91fdf7e205564409085660af5204de28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 20:20:53 +00:00
Treehugger Robot
36233bdf3a Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf am: 8992cd567f am: e2754a0ede 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I040ce31d32934c3d9d8aa783bb75ac3822d3982b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:58:57 +00:00
Treehugger Robot
e2754a0ede Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf am: 8992cd567f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I72cf7afec5bc77920d8d0714a63709982e66b1f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:37:38 +00:00
Treehugger Robot
8992cd567f Merge "Consolidate input OWNERS files" am: 467ebb8379 am: 7845f672bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: I0316c2bc2f120d9a6534758b49595a36c57f9158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:18:41 +00:00
Treehugger Robot
7845f672bf Merge "Consolidate input OWNERS files" am: 467ebb8379 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2021015

Change-Id: Ie1b6446275299c2941271e433746d0b605404e0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-18 19:01:24 +00:00
Treehugger Robot
467ebb8379 Merge "Consolidate input OWNERS files" 2022-05-18 18:42:33 +00:00
Weilin Xu
14be35a5de Merge "Add secondaryId comparison for ProgramInfo" 2022-05-18 17:08:20 +00:00
Weilin Xu
8f19a21592 Add secondaryId comparison for ProgramInfo 
Add a hidden method stricEqual for ProgramSelector so that its
secondaryId can be compared when checking ProgramInfo equality.

Bug: 189775075
Test: m -j, atest android.hardware.radio.tests.functional
Test: atest com.android.server.broadcastradio.hal2
Change-Id: Ia9a297f946f295ea0c5e1d0efbb4ccae55c01b6f
 2022-05-17 22:15:22 +00:00
Shuzhen Wang
23767f998d Camera: Add videoStabilizationMode to Camera session stats 
Test: ./out/host/linux-x86/bin/statsd_testdrive 227
Bug: 224639088
Change-Id: I2a7b0965662b729585d0aa6e6a1e6407e448ddfe
 2022-05-17 14:20:53 -07:00
Prabir Pradhan
2df659f6b0 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 am: 978c20b808 am: b80b9e2ebe am: 6838218b82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I5aa67078e1f831034fd0bf70fea17e0f60031b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 16:23:22 +00:00
Prabir Pradhan
6838218b82 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 am: 978c20b808 am: b80b9e2ebe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I296405f26891b6cc8ed3ef5e7b03dba67ac250fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:58:10 +00:00
Prabir Pradhan
a2436c7ed1 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 am: 978c20b808 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I6e6cf0c853f048e1fb769511933d6dc14cb72e72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:33:28 +00:00
Prabir Pradhan
978c20b808 Merge "Consolidate testing for input changes" into tm-dev am: 648717a3b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18186410

Change-Id: I91801a48d0c935f990b71216c4ece2bd0ba29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-16 14:15:48 +00:00
Prabir Pradhan
648717a3b1 Merge "Consolidate testing for input changes" into tm-dev 2022-05-16 13:22:00 +00:00
TreeHugger Robot
cda2f8b06b Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev am: b15596cb67 am: 065c279cb6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322257

Change-Id: I6ff627ac95497938f78c42f57463755ecbeb15ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 20:07:46 +00:00
TreeHugger Robot
b9b794e2a5 Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev am: b15596cb67 am: 7354e887d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322257

Change-Id: Ic088fa14b4fa8945790a3621b7cf1616fa4ae1ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 20:06:58 +00:00
TreeHugger Robot
065c279cb6 Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev am: b15596cb67 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18322257

Change-Id: I7ced63c3e66fc4275382d8801cc950b55a17ec06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 19:34:43 +00:00