summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-15Merge changes Ia3eae81c,Iff44fb23 am: 372c4810c7temp_sam_242648940Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2184409 Change-Id: I3b19cc0de68c97cbea32b688d73c16a6ef2f069c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15Merge changes Ia3eae81c,Iff44fb23Treehugger Robot
* changes: Fix for: clearAppProfiles interface can cause arbitrary file truncate Fix for: copySystemProfile can cause arbitrary file read and write
2022-08-13Merge "DO NOT MERGE - Merge TP1A.220624.021.A1" into stage-aosp-masterTreeHugger Robot
2022-08-13Merge "DO NOT MERGE Extend mPreviousPresentFences for high refresh rate" ↵TreeHugger Robot
into stage-aosp-master
2022-08-12Fix for: clearAppProfiles interface can cause arbitrary file truncateAlex Buynytskyy
Bug: 216116581 Fixes: 216116581 Test: atest installd_dexopt_test Change-Id: Ia3eae81cc26b28b0d25dc5f5c6cd04ec8c1bafdf
2022-08-12Fix for: copySystemProfile can cause arbitrary file read and writeAlex Buynytskyy
Bug: 216113220 Fixes: 216113220 Test: atest installd_dexopt_test Change-Id: Iff44fb23c351ceacf4ce5d8a2394495e7afc84c8
2022-08-12DO NOT MERGE - Merge TP1A.220624.021.A1Xin Li
Merged-In: Id1a5f29f4ccf2996e37ec99014ce392599b6b725 Change-Id: If71d640c4300b6597f9017c0b8cf90a3a2c555ee
2022-08-11Merge "Add sumir to OWNERS" am: 0bdfe03d68Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1619620 Change-Id: Iff6d077c97147dd1ad47049200d448ccb01a6097 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "Add sumir to OWNERS"Treehugger Robot
2022-08-11Merge "Fix -Wdefaulted-function-deleted warnings." am: d74da324d7Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2176531 Change-Id: If813269837a6215a5fe41a6be660c449d7832891 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "Fix -Wdefaulted-function-deleted warnings."Treehugger Robot
2022-08-11Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" am: 782141c737Bob Badour
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2184399 Change-Id: I4459925e1d687231aff2a9650c2ef05dcb5d0e1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native"Bob Badour
2022-08-11[LSC] Add LOCAL_LICENSE_KINDS to frameworks/nativeBob Badour
Added SPDX-license-identifier-Apache-2.0 to: libs/sensor/fuzz/sensor_fuzzer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: Ie3dd994273a30e87860a5ff29daed06e15fce478
2022-08-11DO NOT MERGE Extend mPreviousPresentFences for high refresh rateJen-Chih Chang
To provide hardware enough time to display a frame under high refresh rate with long sf-duration, we extend mPreviousPresentFences by storing extra slots. We check proper present fence at different moment according to vsync period and sf-duration. Bug: 241193992 Change-Id: I618dd7abdb1f9ca2cb92623cc4d423389d62e402
2022-08-10Merge "Update OWNERS" am: e03fbcc4b9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2181618 Change-Id: I1593a817270d9546f00698631b81c37b27a52de0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Update OWNERS"Treehugger Robot
2022-08-10Merge "Remove framework_native_aidl and use its child filegroups directly" ↵Treehugger Robot
am: 0bfd320f7e Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2179777 Change-Id: I8c6d821308d8ee19df882cb81cf28968e21e1ec6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Remove framework_native_aidl and use its child filegroups directly"Treehugger Robot
2022-08-10Update OWNERSJohn Reck
Test: none Change-Id: Ib2a09808499380b4bc5f7172272d63411afefd4a
2022-08-10Remove framework_native_aidl and use its child filegroups directlyVinh Tran
Currently, `framework_native_aidl` wraps `framework_native_aidl_binder` and `framework_native_aidl_gui`. When converting cc modules with AIDL srcs to Bazel, we run into some challenges with this pattern because an AIDL filegroup module in Soong doesn't map 1-to-1 an aidl_library target in Bazel. See go/bp2build-aidl-filegroup for more details. Instead of pursuing a more sophisticated solution to handle nested AIDL filegroups, we're proposing to flatten the filegroups directly in Android.bp since scale of the problem is small. Doing this makes it easier to convert AIDL filegroups to Bazel for cc rules to use and doesn't change anything in how Soong builds the module. Let me know if there is any drawback of this approach from your perspective. Test: m libgui Change-Id: If3c57acbcace2256d369f31a02f78601bfc9eef2
2022-08-10Merge "Added sensor_fuzzer Test: ./sensor_fuzzer" am: f8cd7cae4bBiddu Singh
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2158836 Change-Id: I6ad7bff39cbeea18feaf9e7d1feee26bc2b7355f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Added sensor_fuzzer Test: ./sensor_fuzzer"Biddu Singh
2022-08-10Merge "Factor out helper method." am: e003cac92eAndrew Walbran
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2177903 Change-Id: Ie38e424d14b1f9410223206d3a383cb321f21851 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10Merge "Factor out helper method."Andrew Walbran
2022-08-10Added sensor_fuzzerBiddu Singh
Test: ./sensor_fuzzer Change-Id: I59c6fff5c6f2562d274b46a5742fb59f9a0ac4e9 Bug: 234548895
2022-08-09Merge "Add more ergonomic API for persisting lazy services." am: b6405c7954Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2177902 Change-Id: If7387238d5bc061f445478b6de32a83a167a9f07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09Factor out helper method.Andrew Walbran
Test: atest libbinder_rs-internal_test Change-Id: I13ec1cb311534d4e534347300dc216d199e42f0f
2022-08-09Merge "Add more ergonomic API for persisting lazy services."Andrew Walbran
2022-08-08Merge "libbinder: allow multiple outgoing threads for single-threaded" am: ↵Treehugger Robot
1c63a158aa Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2167825 Change-Id: If55dc9b2dfc9661d409577c29c4895a25494d63f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Merge "libbinder: allow multiple outgoing threads for single-threaded"Treehugger Robot
2022-08-08Merge "Add methods to construct errors from Rust strings." am: e17a60dd09Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173603 Change-Id: I4e99a6f1cae75d566b1f3bdd0ebf8223524ba8ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Merge "EventHub: Prevent duplicate descriptors" am: 27883159d3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2160836 Change-Id: I5a8a3ff396875484f36de0b146b46c7ae8884077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08Merge "Add methods to construct errors from Rust strings."Treehugger Robot
2022-08-08Merge "EventHub: Prevent duplicate descriptors"Treehugger Robot
2022-08-07Fix -Wdefaulted-function-deleted warnings.Krzysztof Kosiński
Bug: 241680050 Test: presubmit Change-Id: I78a3effb33021b79d451f5e9f32a7d96226bdc60
2022-08-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native" am: 5a19bd1064Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2175887 Change-Id: I4f89ef118c2c587516e983b165978c3e0c4e687e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-05Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/native"Treehugger Robot
2022-08-05libbinder: allow multiple outgoing threads for single-threadedAndrei Homescu
Additional outgoing threads in a single-threaded client do not actually require more threads, so they should be safe to enable. We check the number of incoming threads per RpcSession instead, since those create actual OS threads. Prevents a TOCTTOU issue between calls to setup*Client() and setMaxIncomingThreads() by adding a new mStartedSetup variable that is set early during setupClient, and any calls to RpcSession setters are fatal failures after that point. Bug: 224644083 Test: atest binderRpcTest* Change-Id: Id0ce2cda63e781ecfba86180f3c523be9044d408
2022-08-04EventHub: Prevent duplicate descriptorsJosh Bartel
This updates EventHub to handle some cases that were causing multiple physical devices to be assigned the same descriptor: * If multiple input devices had the same vendor, product, and version it was assumed that the unique_id between the devices could be used to differentiate them if a unique_id was reported. However some input devices (in particular TSTP MTouch devices) are reporting the same unique_id across devices. Physical devices that report multiple inputs (for example a keyboard with a touchpad) were expected to use the same descriptor and the unique id field check is what was being used to detect a single physical device with multiple inputs. This updates EventHub to ensure that a unique descriptor is created for all devices and moves the logic for determining whether a separate InputDevice should be created for the EventHub device into InputDeviceReader. InputReader will update an existing InputDevice if one the InputDeviceIdentifiers has the same product, vendor, revision, bus, uniqueId, and location of an existing InputDevice. Otherwise, InputReader will create a new InputDevice for the InputDescriptor. * When checking for duplicate descriptors it was only checking mDevices for duplicates. However at startup mOpeningDevices is populated on the initial read of input devices and later mDevices is populated when getEvents processes the devices in mOpeningDevices. This adds a new method hasDeviceByDescriptorLocked which can check for an existing device with the descriptor passed in either mDevice or mOpeningDevices. It then updates the check in assignDescriptorLocked to check both mDevices and mOpeningDevices for duplicate descriptors. This also adds a new test: EventHubTest.DevicesWithMatchingUniqueIdsAreUnique This test validates that 2 devices which contain the same vendor, product, and unique id get unique descriptors generated for them by EventHub. This is an example of some touchpanels that enumerate with the same vendor, product, version and unique_id: cat /proc/bus/input/devices I: Bus=0003 Vendor=eeef Product=2828 Version=0111 N: Name="TSTP MTouch" P: Phys=usb-xhci-hcd.1.auto-1.2/input0 S: Sysfs=/devices/platform/soc/a400000.ssusb/a400000.dwc3/ xhci-hcd.1.auto/usb4/4-1/4-1.2/4-1.2:1.0/ 0003:EEEF:2828.0001/input/input2 U: Uniq=CMTP_1.0 H: Handlers=event2 cpufreq B: PROP=2 B: EV=1b B: KEY=400 0 0 0 0 0 B: ABS=260800000000003 B: MSC=20 I: Bus=0003 Vendor=eeef Product=2828 Version=0111 N: Name="TSTP MTouch" P: Phys=usb-xhci-hcd.1.auto-1.3/input0 S: Sysfs=/devices/platform/soc/a400000.ssusb/a400000.dwc3/ xhci-hcd.1.auto/usb4/4-1/4-1.3/4-1.3:1.0/0003:EEEF:2828.0003/ input/input7 U: Uniq=CMTP_1.0 H: Handlers=event6 cpufreq B: PROP=2 B: EV=1b B: KEY=400 0 0 0 0 0 B: ABS=260800000000003 B: MSC=20 I: Bus=0003 Vendor=0eef Product=c000 Version=0111 N: Name="eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00" P: Phys=usb-xhci-hcd.1.auto-1.1.3/input0 S: Sysfs=/devices/platform/soc/a400000.ssusb/a400000.dwc3/ xhci-hcd.1.auto/usb4/4-1/4-1.1/4-1.1.3/4-1.1.3:1.0/ 0003:0EEF:C000.0004/input/input9 U: Uniq= H: Handlers=event8 cpufreq B: PROP=2 B: EV=1b B: KEY=400 0 0 0 0 0 B: ABS=260800000000003 B: MSC=20 I: Bus=0003 Vendor=0eef Product=c000 Version=0111 N: Name="eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00 UNKNOWN" P: Phys=usb-xhci-hcd.1.auto-1.1.3/input0 S: Sysfs=/devices/platform/soc/a400000.ssusb/a400000.dwc3/ xhci-hcd.1.auto/usb4/4-1/4-1.1/4-1.1.3/4-1.1.3:1.0/ 0003:0EEF:C000.0004/input/input11 U: Uniq= H: Handlers=event9 cpufreq B: PROP=0 B: EV=1b B: KEY=30000 0 0 0 0 B: ABS=3 B: MSC=10 Prior to this patch these device will get assigned the same descriptor when looking at dumpsys input: Event Hub State: BuiltInKeyboardId: -2 Devices: 2: eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00 Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event8 Enabled: true Descriptor: 6454aac13d04c4bd9de46924db31b8fa756c858e Location: usb-xhci-hcd.1.auto-1.1.3/input0 ControllerNumber: 0 UniqueId: Identifier: bus=0x0003, vendor=0x0eef, product=0xc000, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_1_3_input0.idc VideoDevice: <none> 4: eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00 Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event6 Enabled: true Descriptor: 6454aac13d04c4bd9de46924db31b8fa756c858e Location: usb-xhci-hcd.1.auto-1.1.2/input0 ControllerNumber: 0 UniqueId: Identifier: bus=0x0003, vendor=0x0eef, product=0xc000, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_1_2_input0.idc VideoDevice: <none> 6: TSTP MTouch Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event4 Enabled: true Descriptor: 25cf0d1204ceeb06804068d960e10f80d22f0edd Location: usb-xhci-hcd.1.auto-1.3/input0 ControllerNumber: 0 UniqueId: CMTP_1.0 Identifier: bus=0x0003, vendor=0xeeef, product=0x2828, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_3_input0.idc VideoDevice: <none> 8: TSTP MTouch Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event2 Enabled: true Descriptor: 25cf0d1204ceeb06804068d960e10f80d22f0edd Location: usb-xhci-hcd.1.auto-1.2/input0 ControllerNumber: 0 UniqueId: CMTP_1.0 Identifier: bus=0x0003, vendor=0xeeef, product=0x2828, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_2_input0.idc VideoDevice: <none> After this patch all devices get assigned unique descriptors when looking at dumpsys input: Event Hub State: BuiltInKeyboardId: -2 Devices: 2: eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00 Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event8 Enabled: true Descriptor: 6454aac13d04c4bd9de46924db31b8fa756c858e Location: usb-xhci-hcd.1.auto-1.1.3/input0 ControllerNumber: 0 UniqueId: Identifier: bus=0x0003, vendor=0x0eef, product=0xc000, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_1_3_input0.idc VideoDevice: <none> 4: TSTP MTouch Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event6 Enabled: true Descriptor: 25cf0d1204ceeb06804068d960e10f80d22f0edd Location: usb-xhci-hcd.1.auto-1.3/input0 ControllerNumber: 0 UniqueId: CMTP_1.0 Identifier: bus=0x0003, vendor=0xeeef, product=0x2828, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_3_input0.idc VideoDevice: <none> 6: eGalax Inc. eGalaxTouch EXC3147-2457-08.00.00 Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event4 Enabled: true Descriptor: 14d833ecd51ba30d9446febf10673051405230f2 Location: usb-xhci-hcd.1.auto-1.1.2/input0 ControllerNumber: 0 UniqueId: Identifier: bus=0x0003, vendor=0x0eef, product=0xc000, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_1_2_input0.idc VideoDevice: <none> 8: TSTP MTouch Classes: TOUCH | TOUCH_MT | EXTERNAL Path: /dev/input/event2 Enabled: true Descriptor: 276553dce9a3e55b90fccfcffd56b233cd3741ab Location: usb-xhci-hcd.1.auto-1.2/input0 ControllerNumber: 0 UniqueId: CMTP_1.0 Identifier: bus=0x0003, vendor=0xeeef, product=0x2828, version=0x0111 KeyLayoutFile: KeyCharacterMapFile: ConfigurationFile: /vendor/usr/idc/usb-xhci-hcd_1_auto-1_2_input0.idc VideoDevice: <none> Test: atest inputflinger_tests Type: Bug Fix Change-Id: Ic4ad37b2629b4553f7a45fd596ffc343fab26f4a
2022-08-04[LSC] Add LOCAL_LICENSE_KINDS to frameworks/nativeBob Badour
Added SPDX-license-identifier-Apache-2.0 to: libs/cputimeinstate/fuzz/cputimeinstate_fuzzer/Android.bp libs/sensor/fuzz/bittube_fuzzer/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I10d6d51c1231121bbab35445d15e9a2134796590
2022-08-04Add more ergonomic API for persisting lazy services.Andrew Walbran
This is being moved from binder_common. Bug: 234019127 Test: atest compos_key_tests MicrodroidHostTestCases MicrodroidTestApp libbinder_rs-internal_test Change-Id: I69c4fb78ff0d9886905d212253f1dfaf1ea51d57
2022-08-04Add methods to construct errors from Rust strings.Andrew Walbran
This is more convenient in most cases than a CStr, and will let callers stop duplicating the code to convert it. Bug: 234019127 Test: atest compos_key_tests MicrodroidHostTestCases MicrodroidTestApp libbinder_rs-internal_test Change-Id: Idc6684f22f33d4ff79d2326499d089dc85e213ea
2022-08-03Merge "libbinder: fix type of return value from {send,read}_msg" am: 2a2071242bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173482 Change-Id: If73b19a59f69340a6de45ae305046ab78a271fea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03Merge "libbinder: fix type of return value from {send,read}_msg"Treehugger Robot
2022-08-03Merge "Add cputimeinstate_fuzzer" am: 10661889c4Biddu Singh
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2152597 Change-Id: I5eb1398e2de291de2e172f29f72a4e5b73fc5d68 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03Merge "Added bittube_fuzzer Test: ./bittube_fuzzer" am: d39700ba34Biddu Singh
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2158876 Change-Id: I35c983c3a1b833fb248ec677bec2ca2cdedc18cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03Merge "Fix unqualified-std-cast-call compiler warning" am: 4e21d361e9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2173682 Change-Id: I58ecff9406bba764d2cb60c941b6a83178ad3d31 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03Merge "Add cputimeinstate_fuzzer"Biddu Singh
2022-08-03Merge "Added bittube_fuzzer Test: ./bittube_fuzzer"Biddu Singh
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 01:37:37 +0000