26 Commits

Author SHA1 Message Date
Michael Bestas
1df01c1fdd Merge tag 'android-14.0.0_r29' into staging/lineage-21_merge-android-14.0.0_r29
Android 14.0.0 release 29

# -----BEGIN PGP SIGNATURE-----
#
# iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZeZWwgAKCRDorT+BmrEO
# eNE9AJ436si4iGfuXraq4i9WmLWWNa6Q4gCgjhDz+mf+NpY25sntQxSTVhlr4+o=
# =0XyA
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue Mar  5 01:18:26 2024 EET
# gpg:                using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78
# gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal]
# gpg: initial-contribution@android.com: Verified 2395 signatures in the past
#      2 years.  Encrypted 4 messages in the past 2 years.
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4340 D135 70EF 945E 8381  0964 E8AD 3F81 9AB1 0E78

# By Roshan Pius (5) and others
# Via Automerger Merge Worker (97) and others
* tag 'android-14.0.0_r29':
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert^2 "redfin(nfc): Modify NFC overlays for NFC apex"
  Remove unused Android.mk under device/google/redfin
  WLC: update AIDL manifest version to 1-2
  Revert "WLC: update AIDL manifest version to 2"
  WLC: update AIDL manifest version to 2
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Revert "redfin(nfc): Modify NFC overlays for NFC apex"
  Fix lunch choices for git_main
  Fix lunch choices for git_main
  redfin(nfc): Modify NFC overlays for NFC apex
  Add BUILD_BROKEN_INCORRECT_PARTITION_IMAGES
  usb: upgrade stats AIDL to v2
  device FCM -= android.*
  Add hardware/qcom/wlan namespace

 Conflicts:
	AndroidProducts.mk
	redfin/BoardConfig.mk

Change-Id: Ie3cf1f67798757f4d6316141b6baf69e4b86ebb2
2024-03-10 09:52:12 +02:00
Kuen-Han Tsai
2c5930b7df Usb.cpp: Fix typos when unable to disable USB data
If Usb.cpp cannot write a zero value to the USB_DATA_PATH file, display
the message of "Not able to turn off usb connection notification".

Test: refactoring CL. Existing tests still pass.
Bug: 301016122
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8b09c31e5f08835e22db53f4b20248c1bd0b7ec6)
Merged-In: I6ce626ed37c245dc1c23f25aff7e24befe9b7fe8
Change-Id: I6ce626ed37c245dc1c23f25aff7e24befe9b7fe8
2023-12-22 16:49:20 +00:00
Roy Luo
ce84482150 usb: upgrade stats AIDL to v2
Upgrade stats AIDL to v2 following pixelstats lib.

Bug: 297224564
Test: Build
Change-Id: Iebc5cee69a21faa302a100d6efcf89b2a05e1bc0
2023-09-21 20:09:14 +00:00
Jimmy Hu
df192e762e Write the pullup value only if new value applied am: d968247718 am: 7f0e10a186 am: e2ef4934d7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/18573447

Change-Id: Ib88ef3259607d266be30285244e9b4e8469474df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-26 03:58:32 +00:00
Jimmy Hu
d968247718 Write the pullup value only if new value applied
Also, remove the non-existing paths and set the initial value of
mUsbDataEnabled.

Bug: 221009551
Test: build, boot
Signed-off-by: Jimmy Hu <hhhuuu@google.com>
Change-Id: Ia44923b13d7a6a381d0024df4e7af5ac0667f0ef
2022-05-24 07:36:17 +00:00
Bob Badour
5404dad6c1 [LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin
Added SPDX-license-identifier-Apache-2.0 to:
  usb/usb/Android.bp
  vibrator/drv2624/bench/Android.bp
  vibrator/drv2624/tests/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ic1bb76783d334ad41adb0290139e0c1c087e7e46
2022-05-12 12:24:31 -07:00
Badhri Jagan Sridharan
cb01b82b5a Implement callbacks for limitPowerTransfer
Implements limiting the sink and source current when limitPowerTransfer
is invoked.

Bug: 200993386
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Change-Id: I44172e6c535137cbb7648fde1fb51d1e2340f298
2022-05-09 21:51:13 -07:00
Badhri Jagan Sridharan
adf8916745 Migrate IUsb implementation to AIDL
This change migrates IUsb implementation to AIDL.
Also, IUsb and IUsbGadget now run in its own processes
to improve stability and isolation.

Port of 3c97a6bb68f6418ee41026f3bd0024405c97cf0c

Bug: 200993386
Change-Id: I681c1ba9c4f547e3cf5dc0fa7c9ee1aaf4fd603c
2022-05-09 21:51:05 -07:00
Muhammad Qureshi
85a3efe568 Revert "Migrate IUsb implementation to AIDL"
Revert submission 16765902-IUSB_redfin

Reason for revert: DeviceBootTest failure - b/217606853
Reverted Changes:
I681c1ba9c:Migrate IUsb implementation to AIDL
Ia8c246102:android.hardware.usb.IUsb AIDL migration

Change-Id: Iab92acf73b2a26e10643d258be6d62c2f4bffa51
2022-02-03 00:29:25 +00:00
Badhri Jagan Sridharan
c0136b8163 Migrate IUsb implementation to AIDL
This change migrates IUsb implementation to AIDL.
Also, IUsb and IUsbGadget now run in its own processes
to improve stability and isolation.

Port of 3c97a6bb68f6418ee41026f3bd0024405c97cf0c

Bug: 200993386
Change-Id: I681c1ba9c4f547e3cf5dc0fa7c9ee1aaf4fd603c
2022-02-01 07:51:21 +00:00
Ray Chi
9abf72cd34 Revert "redfin: usb: add state of usb extcon to monitorffs"
This reverts commit 9d3491c96c.

Reason for revert: using alternate method for original behavior change
Bug: 187261232
Test: build pass

Change-Id: Ib0d5f1a4510c14bfafad9727804b0b084eb37584
2021-05-12 23:46:10 +08:00
Ray Chi
9d3491c96c redfin: usb: add state of usb extcon to monitorffs
Monitorffs needs to check the state of usb extcon to pull up
USB gadget. Therefore, this patch add state of usb extcon and
send this information to monitorffs.

Bug: 173086594
Test: verified pass
Change-Id: I29df29efcf55118241f0ca7072b034c1fb5a37f2
2021-04-23 14:53:44 +08:00
Albert Wang
b1d92d06b7 Revert "Add USB Gadget HAL 1.2 support"
This reverts commit a36726f4fd.

Bug: 181938674
Test: USB gadget function switch normally
Change-Id: I717237a671ee62ef67b96254d15593ce4694e01d
2021-03-31 10:11:34 +08:00
Albert Wang
846d053446 Update USB HAL to V1.3 implementation
Supports to enable/disable USB data signaling

Bug: 161414036
Test: Pass USB V1.3 HIDL tests
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: I85cf5282e487c1695a4cedad00b7fede2c3ad1f8
2021-03-24 09:24:07 +08:00
Albert Wang
a36726f4fd Add USB Gadget HAL 1.2 support
Add a new API to query current USB connection speed

Bug: 181938674
Test: Pass USB Gadget V1.2 HIDL tests
Signed-off-by: Albert Wang <albertccwang@google.com>
Change-Id: Ib908434771854e66d22323b15c02acffe1eff48b
2021-03-23 17:41:42 +08:00
Bob Badour
ec6f90ee58 [LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin am: 5cbf8e687b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/redfin/+/13848445

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fc3247dec36f7b7dfed6634d9df22f7f3cda132
2021-03-12 18:38:05 +00:00
Bob Badour
5cbf8e687b [LSC] Add LOCAL_LICENSE_KINDS to device/google/redfin
Added SPDX-license-identifier-Apache-2.0 to:
  dumpstate/Android.mk
  redfin/overlay_packages/SettingsOverlayG5NZ6/Android.bp
  redfin/overlay_packages/SettingsOverlayGD1YQ/Android.bp
  redfin/overlay_packages/SettingsOverlayGTT9Q/Android.bp
  self-extractors/qcom/staging/Android.mk
  usb/Android.bp
  vibrator/Android.bp
  vibrator/drv2624/Android.bp
  vibrator/drv2624/bench/Android.bp
  vibrator/drv2624/tests/Android.bp
  voice_processing/Android.bp

Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:
  Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I192bb56f5e770950bebf7f91e430d4cff3a0a73b
2021-03-11 18:59:02 -08:00
pumahsu
bdf4ac7894 Prevent null vector accessing in USB HAL
If getPortStatusHelper() failed to allocate currentPortStatus_1_2 size,
it should not access this vector, otherwise it would cause crash.

Bug: 142366879
Bug: 174635444
Test: try to adb root and re-connect USB
Change-Id: I0d0d9cd1dccd646ce270b562f2922da15338bfc1
Signed-off-by: pumahsu <pumahsu@google.com>
Signed-off-by: Ricky Niu <rickyniu@google.com>
2020-12-04 10:10:58 +00:00
Howard Yen
4b39e552fd Update USB Gadget HAL to V1.1 implementation am: b1eb3c4c18
Change-Id: I7df27bf5bba949b06541591f68683c36e1267f63
2020-05-29 21:22:26 +08:00
Howard Yen
31b4aa302c Update USB Gadget HAL to V1.1 implementation
Bug: 138702846
Test: build pass, function works
Change-Id: I82a74d31f4339e4b4b8c59d879871550b943a36e
2020-05-29 21:22:25 +08:00
raychi
7103885af8 UsbGadget: change the permission
There is no necessary to get root permission for USB Hal.
Therefore, this commit will remove the root permission.

Bug: 154895957
Test: build pass and verified USB HAL
Change-Id: Ib88e4dc124a8b5b803989b51c2e8c085d9b2e65e
2020-05-29 21:22:23 +08:00
Kyle Tso
29edf80f17 Do not enable Moisture Detection if vendor prop is set
setprop vendor.usb.contaminantdisable true
disable contaminant detection.

Bug: 154985161
Test: setprop vendor.usb.contaminantdisable true
Change-Id: I2cfd5baab45074f2ca68216cb5d8b9790d711b75
(cherry picked from commit 21e7d5aec7e3e5b9b032b71a3153310376a46ae2)
[separated the commit into rc part and HAL part]
Signed-off-by: Kyle Tso <kyletso@google.com>
2020-05-29 21:22:20 +08:00
Badhri Jagan Sridharan
606ee94a25 Do not moisture detection when uart is enabled.
Bug: 154985161
Test: Tested with mock circuit. Moisture detection does not
reenable when serial uart is enabled.

Change-Id: If7d43227a603a5645d4c581477cb9c144c5e9d86
(cherry picked from commit ccc09ed8a9b826d56f685d0e618e1f3cc0403c12)
Signed-off-by: Kyle Tso <kyletso@google.com>
2020-05-29 21:22:19 +08:00
Steven Moreland
178f2195e1 Remove libhwbinder/libhidltransport deps
Since these were combined into libhidlbase.

Bug: 135686713
Test: build only (libhwbinder/libhidltransport are empty)
Change-Id: I82b2f09a41aaffd30e943b87c0a84bc85fdf4c14
2019-10-02 12:49:06 -07:00
Kyle Tso
db19b2e35f UsbGadget: Add specific vendor function composition
New vendor function composition:
diag,serial_cdev,rmnet_gsi,dpl_gsi,qdss

Bug: 141654033
Bug: 141667188
Test: Build pass
Change-Id: Ib2719bb944ee9a7f87ad90c4e6649982a61988fe
Signed-off-by: Kyle Tso <kyletso@google.com>
2019-09-26 09:22:03 +00:00
Alex Hong
1c2dbd8222 Create aosp_redfin target
Bug: 139478768
Change-Id: I061f89a72b5e7b81280406abf85cca479b86f340
2019-08-19 12:39:55 +08:00