Commit graph

76279 commits

Author SHA1 Message Date
Elliott Hughes
1a46ec978a Merge "bugreport: fix warning." am: 734f0a2fa1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1327474

Change-Id: Ibb57ddc1acdb5a4b2816803c0a2bb9af25154e8b
2020-06-10 15:16:40 +00:00
Elliott Hughes
734f0a2fa1 Merge "bugreport: fix warning." 2020-06-10 15:06:34 +00:00
Elliott Hughes
1febe136f1 bugreport: fix warning.
The command the warning wants you to use instead is "bugreportz", not
"bugreport". You're already running bugreport!

...unless you're on the host and you're running `adb bugreport` which
silently uses bugreportz behind the scenes. No wonder humans are
confused!

Also error out if given any arguments, since no arguments are supported.

Bug: http://b/156667896
Bug: http://b/29448020
Test: adb shell bugreport
Test: adb shell bugreport --help
Change-Id: Ia141e89eb5019d52247f57c5095288e96f57dccd
2020-06-09 13:01:12 -07:00
Treehugger Robot
49990b462a Merge "TouchInputMapper: Use default viewport for PointerController" am: 69f1479abe
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1319647

Change-Id: I378e82dc2c6f1fe8506c7639f5c5244828589ea9
2020-06-08 17:02:28 +00:00
Treehugger Robot
69f1479abe Merge "TouchInputMapper: Use default viewport for PointerController" 2020-06-08 16:45:50 +00:00
Yo Chiang
ddb4231578 Merge "dumpstate: Fix required dependencies" am: 9a23df27d5
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323972

Change-Id: I3f4e50d01ce5570fc9aff5a4501c12e686765f4a
2020-06-08 16:04:34 +00:00
Jooyung Han
b78c851de4 Merge "Set min_sdk_version to be part of mainline modules" am: ee959e950b
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323982

Change-Id: I101977e743765e0ec8ec2bfeac51037fd4144944
2020-06-08 16:04:12 +00:00
Xin Li
1c4ff8137d [automerger skipped] Merge "Merge QQ3A.200605.002 into master" am: e3e5b30b99 -s ours
am skip reason: Change-Id Iea2c5fb12ea7b1ad563f540349063fcda557fbc1 with SHA-1 560de1587b is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1323615

Change-Id: I6ad7aef5610ae30a68705047baeef51f2e21b477
2020-06-08 15:56:46 +00:00
Yo Chiang
9a23df27d5 Merge "dumpstate: Fix required dependencies" 2020-06-08 07:41:04 +00:00
Jooyung Han
ee959e950b Merge "Set min_sdk_version to be part of mainline modules" 2020-06-08 06:56:41 +00:00
Xin Li
e3e5b30b99 Merge "Merge QQ3A.200605.002 into master" 2020-06-06 01:41:22 +00:00
Xin Li
2360c2a7c0 Merge QQ3A.200605.002 into master
Bug: 158095402
Merged-In: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
Change-Id: Ie56daaaf7d1e9dfddf0dcd1adda00a3732671b0d
2020-06-05 15:17:42 -07:00
Jooyung Han
2cf9404386 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I6818cdedfca4a3c8bd503b880db9240de7be757d
2020-06-05 17:32:57 +09:00
Yifan Hong
0d2c95a711 Merge "Revert "servicemanager: hard failure for missing context"" am: 060a736711
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1322621

Change-Id: I94fb1123cbc4e9aaf1c5d0297ea0a7f6e6665cd6
2020-06-04 18:17:19 +00:00
Yifan Hong
060a736711 Merge "Revert "servicemanager: hard failure for missing context"" 2020-06-04 18:02:07 +00:00
Yo Chiang
1151baf223 dumpstate: Fix required dependencies
TARGET module dumpstate requires non-existent: df
TARGET module dumpstate requires non-existent: getprop
TARGET module dumpstate requires non-existent: ip6tables
TARGET module dumpstate requires non-existent: kill
TARGET module dumpstate requires non-existent: lsmod
TARGET module dumpstate requires non-existent: lsof
TARGET module dumpstate requires non-existent: netstat
TARGET module dumpstate requires non-existent: printenv
TARGET module dumpstate requires non-existent: top
TARGET module dumpstate requires non-existent: uptime
TARGET module dumpstate requires non-existent: vril-dump

df, kill, lsmod, lsof, netstat, printenv, top, uptime are symlinks of toybox.
getprop is symlink of toolbox.
ip6tables is symlink of iptables.
vril-dump doesn't exist.

Bug: 7456955
Test: TH noop
Change-Id: I3a8b07778ae1042a51e1d5c1f0de06a55d01319d
2020-06-04 17:12:34 +08:00
Yifan Hong
ba7fcc3bad Revert "servicemanager: hard failure for missing context"
This reverts commit b5a0f22ce1.

Reason for revert: break mixed builds

Fixes: 157555971
Bug: 152636392
Change-Id: I3972e36622da3da261263bc4cc8b1e248a99152b
2020-06-03 16:53:18 +00:00
Orion Hodson
560de1587b Merge "Add dependencies on jni_headers" am: ed38697b9f
Change-Id: Iea2c5fb12ea7b1ad563f540349063fcda557fbc1
2020-06-01 09:39:13 +00:00
Orion Hodson
ed38697b9f Merge "Add dependencies on jni_headers" 2020-06-01 09:20:10 +00:00
Treehugger Robot
036b105b6e Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader" am: 43beafe0b0
Change-Id: Ib3930377b494bf7bafce339165dff428a30563b6
2020-05-29 21:57:19 +00:00
Garfield Tan
555e4f25a5 Add metadata for mouse cursor. am: b0412cfa69
Change-Id: Ieca70489377e10149e73febe647a59f28adce418
2020-05-29 21:57:16 +00:00
Chun-Wei Wang
15439d0c07 Merge "Delete APK snapshots during restoration (3/n)" am: b87b05f286
Change-Id: I08d836616888dc5e7cb905ae3c42316e533a0bde
2020-05-29 21:26:20 +00:00
Treehugger Robot
43beafe0b0 Merge changes from topics "cursor_type_hotspot", "set_viewport_in_input_reader"
* changes:
  Let InputReader set mouse cursor's display.
  Add metadata for mouse cursor.
2020-05-29 19:23:45 +00:00
Chun-Wei Wang
b87b05f286 Merge "Delete APK snapshots during restoration (3/n)" 2020-05-29 08:01:48 +00:00
Steven Moreland
bc53ad2700 Merge changes from topic "parcel-allocation" am: 3769b77023
Change-Id: I12622f707bd9ce55617b479ff67d398a888c01c0
2020-05-28 20:26:08 +00:00
Steven Moreland
f4245eb38a libbinder: TEST_MAPPING CtsOsTestCases am: 2b9d365bcc
Change-Id: Ifb2bba9ce8a59d4eb07b8ebeb2af594e380937d1
2020-05-28 20:26:05 +00:00
Steven Moreland
3769b77023 Merge changes from topic "parcel-allocation"
* changes:
  Reland "binder: Parcel avoid too small initial allocation"
  libbinder: TEST_MAPPING CtsOsTestCases
2020-05-28 20:11:08 +00:00
Prabir Pradhan
c6d9967e89 TouchInputMapper: Use default viewport for PointerController
There was a possibility of accidental mouse warping between multiple
displays. InputReader has the responsibility of setting the
DisplayViewport that the pointer is associated with, but framework sets
a recommended "defaultPointerDisplayId".

TouchInputMapper uses PointerController for touchpads
(DEVICE_MODE_POINTER) and for when "showTouches" (touch spots) are
enabled. In the latter case, TouchInputMapper was setting the pointer's
DisplayViewport to the viewport that the mapper itself was associated
with. When this viewport differs from the one recommended by framework,
there is a possibility that the pointer is moved unexpectedly to the
display associated with the mapper. The possibility of this happening
depends upon the the order in which the various input mappers are
configured.

This CL removes the possibility of unexpected warping by making
TouchInputMapper always use the viewport recommended by framework.

Bug: 146385350
Test: atest inputflinger_tests
Change-Id: Id73c59bce825855bc8c829c3a5a18c141593057e
Merged-In: Id73c59bce825855bc8c829c3a5a18c141593057e
2020-05-28 12:01:35 -07:00
Garfield Tan
b0412cfa69 Add metadata for mouse cursor.
Mouse cursor metadata is stored in a parcel with a int32_t for mouse
cursor type, and two floats for mouse hotspotX/Y. Therefore move the
parcel to byte vector conversion into SurfaceComposerClient. If anyone
needs to store metadata in raw byte vector we can change the interface
later.

Bug: 130822623
Test: SurfaceFlinger can get cursor type and hotspot.
Change-Id: Ia7e0c952fcaefd14280322d9b2269f4dba38e8da
Merged-In: Ia7e0c952fcaefd14280322d9b2269f4dba38e8da
2020-05-28 12:01:35 -07:00
Garfield Tan
0a080c3666 Let InputReader set mouse cursor's display.
InputReader was already responsible to bind device/event and display. It
makes sense to further extend it to control the display where mouse
cursor is shown.

Bug: 146385350
Test: Mouse cursor shows up at expected display.
Test: atest inputflinger_tests
Change-Id: Ie7a9546550b70c8834462b06de929472196fe713
Merged-In: Ie7a9546550b70c8834462b06de929472196fe713
2020-05-28 12:01:35 -07:00
Steven Moreland
042ae82311 Reland "binder: Parcel avoid too small initial allocation"
Bug: 150149045
This reverts commit ce3262092e.

Reason for revert: reland original fix after fixing android.os.cts.ParcelTest

The place where the default size is changed here from the original CL.
Now, when explicit setDataCapacity calls are made, we no longer use an
artificially larger size.

Test: atest android.os.cts.ParcelTest
Test: atest binderAllocationLimits

Change-Id: I08c5eeb3be0b61ccf2f5e34b5bc7b45f58f8cbcb
2020-05-27 20:09:35 +00:00
Steven Moreland
2b9d365bcc libbinder: TEST_MAPPING CtsOsTestCases
Since there are several parcel tests and other binder tests there.

Bug: 157536820
Test: CtsOsTestCases
Change-Id: I22d2e866dd0c5370cac22b0cef545f4e0c1adf63
2020-05-27 18:40:16 +00:00
Steven Moreland
88bda7d41c Merge "Revert "binder: Parcel avoid too small initial allocation"" am: 839fc14337
Change-Id: Ie79c82a894ac2f0fe4d12cb486dc564015249ebf
2020-05-27 17:55:04 +00:00
Steven Moreland
839fc14337 Merge "Revert "binder: Parcel avoid too small initial allocation"" 2020-05-27 17:43:24 +00:00
Steven Moreland
ce3262092e Revert "binder: Parcel avoid too small initial allocation"
This reverts commit 7dacc699a4.

Reason for revert: broke android.os.cts.ParcelTest which is blocking some presubmit.

Change-Id: I71a6481a5e00adf5096eb824ada8fef3c670dfdd
2020-05-27 17:42:57 +00:00
Orion Hodson
a58ef3567b Add dependencies on jni_headers
Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: m checkbuild
Change-Id: I06873e61e519b6e54d7325f90231bce732790366
Merged-In: I06873e61e519b6e54d7325f90231bce732790366
Exempt-From-Owner-Approval: build clean-up
(cherry picked from commit e32877afcc)
2020-05-27 16:52:08 +01:00
Steven Moreland
8fd3d09683 Merge "binder: Parcel avoid too small initial allocation" am: 45e0cf7236
Change-Id: I49f52ab8f78dab3c8927e58882794c3b3332206f
2020-05-26 17:41:07 +00:00
Steven Moreland
45e0cf7236 Merge "binder: Parcel avoid too small initial allocation" 2020-05-26 17:30:19 +00:00
Treehugger Robot
9876e1fcfb Merge "CompositionEngine: fix HWC transform calculation" am: cc56eff39b
Change-Id: Ic0d70e23586897ebdfd98345f88365d5bd4993db
2020-05-21 23:34:52 +00:00
Treehugger Robot
cc56eff39b Merge "CompositionEngine: fix HWC transform calculation" 2020-05-21 23:20:58 +00:00
Rashed Abdel-Tawab
9135ddd59a CompositionEngine: fix HWC transform calculation
Use the correct display transform in calculateOutputRelativeBufferTransform().
When SF_PRIMARY_DISPLAY_ORIENTATION is set, DisplayDevice only updates the
logical to physical transform; OutputCompositionState.orientation doesn't
change.

Test: - OutputLayerTest.displayInstallOrientationBufferTransformSetTo90
      - Run "dumpsys SurfaceFlinger" on a device with SF_PRIMARY_DISPLAY_ORIENTATION
        set to 90 and verify that the HWC transform is 0 (identity)
      - screencap
Change-Id: I079b5ea22de8d47a7fb7233d01decfbd4b578be8
Merged-In: I079b5ea22de8d47a7fb7233d01decfbd4b578be8
2020-05-21 22:02:05 +00:00
Steven Moreland
6053d8370a Merge "servicemanager: hard failure for missing context" am: fcb357810a
Change-Id: Ic66188cde527095b1de4444ec3e872c8a49b48d8
2020-05-20 22:46:22 +00:00
Steven Moreland
fcb357810a Merge "servicemanager: hard failure for missing context" 2020-05-20 22:29:23 +00:00
Steven Moreland
7dacc699a4 binder: Parcel avoid too small initial allocation
When a transaction is being sent, frequently many allocations are in a
row. In order to avoid all these allocations, creating a minimum
allocation size here. A test is also added which ensures that a basic
transaction takes exactly one allocation.

Bug: 150149045
Test: atest binderAllocationLimits
Change-Id: I88ab066328158a8b73dd81201b796f247c4dbbd0
2020-05-20 22:15:58 +00:00
Steven Moreland
b5a0f22ce1 servicemanager: hard failure for missing context
Bug: 152636392
Test: boot
Change-Id: I9940bde64547e3e28fc3eabf33cb8c2ef983dc56
2020-05-19 23:09:50 +00:00
Steven Moreland
300da2feb3 Merge "log when waiting on a servicemanager" am: 377fc5aadd
Change-Id: I3f1aa0b2f41b7059b61b52f7ceb22e96eb063f40
2020-05-19 22:33:24 +00:00
Steven Moreland
377fc5aadd Merge "log when waiting on a servicemanager" 2020-05-19 22:15:30 +00:00
Steven Moreland
39a572183a log when waiting on a servicemanager
Since vndservicemanager is no longer installed by default, this gets hit
on those devices.

Bug: 156571068
Test: TH
Change-Id: I31af865326e9a69042e5c53b63637b95d6de9ad1
2020-05-19 18:11:01 +00:00
Nikita Ioffe
ccb268cb80 Merge "Add flag to cmd for dynamic services" am: 6540819ca8
Change-Id: I04be6ecf0ff9aee11ab488ab4ac8933420306209
2020-05-19 12:12:49 +00:00
Nikita Ioffe
6540819ca8 Merge "Add flag to cmd for dynamic services" 2020-05-19 11:59:33 +00:00