mirror of
https://github.com/ponces/treble_aosp.git
synced 2024-11-22 03:06:13 +00:00
33 lines
1.8 KiB
Diff
33 lines
1.8 KiB
Diff
From dca461b69f7ad858b43c3f06ba6624756413e7d6 Mon Sep 17 00:00:00 2001
|
|
From: Pierre-Hugues Husson <phh@phh.me>
|
|
Date: Tue, 14 Aug 2018 21:48:19 +0200
|
|
Subject: [PATCH 1/4] Act as usb device when there is no hal, but we believe we
|
|
are a device
|
|
|
|
Change-Id: I036090738525fd8cc63534d52d02ab1852950a7d
|
|
---
|
|
.../usb/UsbConnectionBroadcastReceiver.java | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
diff --git a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
|
|
index 16ea602bc4f..262afbcbb31 100644
|
|
--- a/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
|
|
+++ b/src/com/android/settings/connecteddevice/usb/UsbConnectionBroadcastReceiver.java
|
|
@@ -93,6 +93,13 @@ public class UsbConnectionBroadcastReceiver extends BroadcastReceiver implements
|
|
mFunctions = functions;
|
|
mDataRole = mUsbBackend.getDataRole();
|
|
mPowerRole = mUsbBackend.getPowerRole();
|
|
+ //If we have no USB HAL, mDataRole is invalid
|
|
+ //But we can't be connected AND have none data_role, so it's safe.
|
|
+ //It would be better to fix UsbManager when no HAL is available, but that's more work
|
|
+ if(mDataRole == UsbPortStatus.DATA_ROLE_NONE &&
|
|
+ intent.getExtras().getBoolean(UsbManager.USB_CONNECTED) &&
|
|
+ !intent.getExtras().getBoolean(UsbManager.USB_HOST_CONNECTED))
|
|
+ mDataRole = UsbPortStatus.DATA_ROLE_DEVICE;
|
|
} else if (UsbManager.ACTION_USB_PORT_CHANGED.equals(intent.getAction())) {
|
|
UsbPortStatus portStatus = intent.getExtras()
|
|
.getParcelable(UsbManager.EXTRA_PORT_STATUS);
|
|
--
|
|
2.34.1
|
|
|