Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 8120673 from a387c0f5c0 to tm-release

Browse source 
Change-Id: Ic5956f55acb82ba93f576632179b6634ed12a274
This commit is contained in:
Android Build Coastguard Worker 2022-01-27 02:02:09 +00:00
commit 2e0addd293
7 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
device.mk
View file

@ -1026,6 +1026,12 @@ PRODUCT_SOONG_NAMESPACES += \
$(call soong_config_set,aoc_audio_board,platform,$(TARGET_BOARD_PLATFORM))
## AoC soong
PRODUCT_SOONG_NAMESPACES += \
vendor/google/whitechapel/aoc
$(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM))
$(call soong_config_set,android_hardware_audio,run_64bit,true)
# Audio properties

2
device_framework_matrix_product.xml
View file

@ -128,7 +128,7 @@
</hal>
<hal format="hidl" optional="true">
<name>vendor.google.google_battery</name>
<version>1.1</version>
<version>1.2</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>

2
manifest.xml
View file

@ -154,7 +154,7 @@
<hal format="hidl">
<name>vendor.google.google_battery</name>
<transport>hwbinder</transport>
<version>1.1</version>
<version>1.2</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>

2
manifest_64.xml
View file

@ -155,7 +155,7 @@
<hal format="hidl">
<name>vendor.google.google_battery</name>
<transport>hwbinder</transport>
<version>1.1</version>
<version>1.2</version>
<interface>
<name>IGoogleBattery</name>
<instance>default</instance>

1
overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -227,7 +227,6 @@
<string-array translatable="false" name="config_defaultPinnerServiceFiles">
<item>"/apex/com.android.art/javalib/core-oj.jar"</item>
<item>"/apex/com.android.art/javalib/core-libart.jar"</item>
<item>"/apex/com.android.media/javalib/updatable-media.jar"</item>
<item>"/system/framework/framework.jar"</item>
<item>"/system/framework/services.jar"</item>
<item>"/system/bin/surfaceflinger"</item>

25
usb/usb/Usb.cpp
View file

@ -172,6 +172,31 @@ ScopedAStatus Usb::enableUsbDataWhileDocked(const string& in_portName,
return ScopedAStatus::ok();
}
ScopedAStatus Usb::resetUsbPort(const std::string& in_portName, int64_t in_transactionId) {
bool result = true;
std::vector<PortStatus> currentPortStatus;
ALOGI("Userspace reset USB Port. opID:%ld", in_transactionId);
if (!WriteStringToFile("none", PULLUP_PATH)) {
ALOGI("Gadget cannot be pulled down");
result = false;
}
pthread_mutex_lock(&mLock);
if (mCallback != NULL) {
::ndk::ScopedAStatus ret = mCallback->notifyResetUsbPortStatus(
in_portName, result ? Status::SUCCESS : Status::ERROR, in_transactionId);
if (!ret.isOk())
ALOGE("notifyTransactionStatus error %s", ret.getDescription().c_str());
} else {
ALOGE("Not notifying the userspace. Callback is not set");
}
pthread_mutex_unlock(&mLock);
return ::ndk::ScopedAStatus::ok();
}
Status getI2cBusHelper(string *name) {
DIR *dp;

1
usb/usb/Usb.h
View file

@ -69,6 +69,7 @@ struct Usb : public BnUsb {
int64_t in_transactionId) override;
ScopedAStatus limitPowerTransfer(const string& in_portName, bool in_limit,
int64_t in_transactionId) override;
ScopedAStatus resetUsbPort(const string& in_portName, int64_t in_transactionId) override;
std::shared_ptr<::aidl::android::hardware::usb::IUsbCallback> mCallback;
// Protects mCallback variable