Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
771,061 Commits 3 Branches 0 Tags
d565eada2d2ce2b0118ef6410ba4e5e4aeebc03b
Commit Graph

5451 Commits

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

Change-Id: I9a35334927540625871b82fcb8b57c3299c428e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:31:37 +00:00
TreeHugger Robot
0e85d31190 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev am: aedd857b68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18375396

Change-Id: I1391e5ac4a6bb5ad480ebab9a154831db5fb8b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-03 18:13:14 +00:00
TreeHugger Robot
aedd857b68 Merge "Logging for DisplayPowerController SuspendBlockers" into tm-dev 2022-06-03 17:59:53 +00:00
Antony Sargent
4c50bc7922 Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e am: de2d849abd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ie6e5871776583b46bc3ad5c5a88ac808baf3d984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:59:11 +00:00
Antony Sargent
de2d849abd Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: If653afb4a286de6046e9bf4392a2fa924de5c92b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:35:54 +00:00
Antony Sargent
e1a0bf366d Merge "Prevent deadlocks during VirtualDisplay creation" into tm-dev am: fc6eb70e0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18246032

Change-Id: Ieafea2c80f875c16215ed05f77c22ec7445fe8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-30 00:34:42 +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
88c59ce930 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: If4a2e2bd428ee33ac66721ef3a622d54606c712e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 03:19:42 +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
90b5c42444 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: Idc7555a3d1334951c732100a6ab6347fb0c9c91a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 02:59:56 +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
5deb7f1481 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: I8996ae2a7ede03fa90407234102d58e2a407fcdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:43:32 +00:00
Emilian Peev
350266f050 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: I7a156272056d5dc26db7325514f33f2adc7211ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-24 22:35:26 +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
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
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
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
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
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
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
TreeHugger Robot
b15596cb67 Merge "Camera: Update doc to describe tradeoff of DEFAULT timestamp base" into tm-dev 2022-05-14 18:05:10 +00:00
TreeHugger Robot
edc4e42618 Merge "Add note about Sensor.TYPE_HEAD_TRACKER visibility" into tm-dev am: 616530de0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18381200

Change-Id: Ibecbc1b8eb6b42b1a68f760961e3fbd9cba14f39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-14 04:20:56 +00:00
Brian Duddie
73d4b0f98f Add note about Sensor.TYPE_HEAD_TRACKER visibility 
In Android 13, this sensor type is generally not expected to be used by
apps.

Bug: 224619073
Test: compile; comment change only
Change-Id: Ic6f56b6d354777dcf608d34314d6e4e7b7af36b8
 2022-05-13 20:47:08 +00:00
Shuzhen Wang
bca2a32c73 Camera: Update doc to describe tradeoff of DEFAULT timestamp base 
Describe the tradeoffs of preview jitter reduction, and mention that
the application can turn off jitter reduction for better latency.

Test: Build
Bug: 195025014
Change-Id: I68f99efe6a35ae9db0f4cdf75ef31879f8550ff8
 2022-05-13 10:47:37 -07:00
TreeHugger Robot
200c269fc7 Merge "Reland: Change input injection security model" into tm-dev am: d0f6ad2f30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17689973

Change-Id: I79f4598fd2d915422d8db6b3ed0076f78a369dab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-11 20:34:28 +00:00
Prabir Pradhan
0f9ea02be0 Reland: Change input injection security model 
This reverts commit 6b3c6cae3f.

Changes from revert:
- Explicitly maintain the same behavior as previous versions of Android,
  where injection is allowed into all window if the caller has the
  INJECT_EVENTS permission, even if it is targeting a certain uid. This
  fallback will be removed separately in b/228161340.
- Clear the calling identity before checking if the injection source has
  a permisssion to avoid hitting blanket-checks in PackageManager that
  denys permissions in some cases, such as if the permission check call
  is coming from an instant app (b/228319794).
- Leave the existing IInputManager#injectInputEvent method signature
  unchanged, and add a new input method injectInputEventToTarget to
  perform targeted injection. This makes it so that tools or apps
  relying on the @UnsupportedAppUsage injection method will not be
  broken by a change in the method's signature (b/228583652).

Bug: 207667844
Bug: 194952792
Test: Run tests affected by b/228319794 and its duplicates using
cts-tradefed, so that they are also run as instant apps.
Test: Test scrcpy tool works locally

Change-Id: I503e4f087501e3aecf2c18b4b1d27e51ecda59ac
Merged-In: I503e4f087501e3aecf2c18b4b1d27e51ecda59ac
 2022-05-10 18:40:32 +00:00
TreeHugger Robot
847661ebbd Merge "Switched face acquire strings" into tm-d1-dev 2022-05-09 21:46:01 +00:00
Emilian Peev
c7f3fa1920 Camera: Pass shared outputs during advanced extension configuration 
Shared outputs are not expected to be part of the main output
configuration list. Expect to receive the shared surfaces only
as part of the corresponding shared list.

Bug: 231636379
Test: Camera CTS
Change-Id: I67547a38ed97d55c8270196403d4af5d62795351
 2022-05-09 11:10:48 -07:00
Shuzhen Wang
9895959a71 Camera: Clarify benefit of readout vs exposure timestamp 
Update developer doc with minor clarification.

Test: Build
Bug: 229097448
Bug: 229773853
Change-Id: Ice7c88a47366759c6024de7a9a30a8114c1ff655
 2022-05-09 15:42:12 +00:00
TreeHugger Robot
daf69b3d66 Merge "Camera: Add support for readout timestamp" into tm-d1-dev 2022-05-07 04:09:50 +00:00
Joshua McCloskey
d3c44a394d Switched face acquire strings 
Switched too_left with too_right face acquired string
Switched too_high with too_low face acquired string
Test: Verified manually on different devices
Fixes: 231400685

Change-Id: I6b29c8953f260e1c662acc38a1ce6006d18ecfc9
 2022-05-06 17:09:00 +00:00
TreeHugger Robot
284657d0ae Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev am: 4d2ae2655e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18104867

Change-Id: I148bcfb5a0811ce42b76065a8a19802a2ceff43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 23:34:01 +00:00
TreeHugger Robot
4d2ae2655e Merge "Camera: Propagate extension results in case of dropped frames" into tm-dev 2022-05-05 23:11:58 +00:00
Prabir Pradhan
9c54e12337 Consolidate testing for input changes 
Make sure a consistent and comprehensive set of tests run when parts of
the input pipeline are changed.

Bug: 231623960
Test: presubmit
Change-Id: I08cd9966d436d21694e26b81aaf9c141cea47595
 2022-05-05 21:19:15 +00:00
Prabir Pradhan
4601c17fe1 Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev am: dd2c72a65d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351976

Change-Id: Iacf94fba3ce56091fd83f274dae1195dedbd726f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 19:38:16 +00:00
Prabir Pradhan
dd2c72a65d Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev 
* changes:
  Synchronize pointer display change requests
  Make virtual input device creation synchronous
 2022-05-05 19:21:40 +00:00
Evan Severson
2f067d2f62 Merge "Make the authentication requirement configurable for toggles" into tm-dev am: 7935bf8b27 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17769812

Change-Id: Ia3ef87c3182de5f7ddc0db9fa1c2ae6022cbbd5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 16:57:33 +00:00
Evan Severson
7935bf8b27 Merge "Make the authentication requirement configurable for toggles" into tm-dev 2022-05-05 16:28:13 +00:00