Snap for 12337407 from 2035632a2a to 25Q1-release

Change-Id: I9d20f4b749360201dbf361c478562fd173840d46
This commit is contained in:
Android Build Coastguard Worker 2024-09-07 23:01:20 +00:00
commit aa00b52d46
7 changed files with 111 additions and 22 deletions

View file

@ -447,5 +447,6 @@ PRODUCT_PACKAGES += \
AvoidAppsInCutoutOverlay
# Bluetooth device id
# Felix: 0x410C
PRODUCT_PRODUCT_PROPERTIES += \
bluetooth.device_id.product_id=20494
bluetooth.device_id.product_id=16652

View file

@ -39,6 +39,7 @@ USES_IDISPLAY_INTF_SEC := true
include device/google/gs201/BoardConfig-common.mk
-include vendor/google_devices/gs201/prebuilts/BoardConfigVendor.mk
include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/felix/proprietary/BoardConfigVendor.mk
include device/google/felix-sepolicy/felix-sepolicy.mk
include device/google/felix/wifi/BoardConfig-wifi.mk

View file

@ -48,15 +48,6 @@
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.mapper</name>
<transport arch="32+64">passthrough</transport>
<version>4.0</version>
<interface>
<name>IMapper</name>
<instance>default</instance>
</interface>
</hal>
<hal format="hidl">
<name>android.hardware.graphics.composer</name>
<transport>hwbinder</transport>

View file

@ -21,7 +21,8 @@
"1539000",
"1352000",
"1014000",
"421000"
"421000",
"546000"
],
"ResetOnInit": true
},
@ -884,6 +885,12 @@
"Duration": 50,
"Value": "302000"
},
{
"PowerHint": "DISPLAY_INACTIVE",
"Node": "MemFreq",
"Duration": 0,
"Value": "421000"
},
{
"PowerHint": "CPU_LOAD_RESET",
"Node": "MemFreq",

View file

@ -20,6 +20,7 @@
#include <sys/epoll.h>
#include <utils/Trace.h>
#include <chrono>
#include <list>
#include <map>
#include <sstream>
@ -48,17 +49,19 @@ class HwApiBase {
class Record : public RecordInterface {
public:
Record(const char *func, const T &value, const std::ios *stream)
: mFunc(func), mValue(value), mStream(stream) {}
: mFunc(func), mValue(value), mStream(stream),
mTp(std::chrono::system_clock::system_clock::now()) {}
std::string toString(const NamesMap &names) override;
private:
const char *mFunc;
const T mValue;
const std::ios *mStream;
const std::chrono::system_clock::time_point mTp;
};
using Records = std::list<std::unique_ptr<RecordInterface>>;
static constexpr uint32_t RECORDS_SIZE = 32;
static constexpr uint32_t RECORDS_SIZE = 2048;
public:
HwApiBase();
@ -181,9 +184,14 @@ template <typename T>
std::string HwApiBase::Record<T>::toString(const NamesMap &names) {
using utils::operator<<;
std::stringstream ret;
auto lTp = std::chrono::system_clock::to_time_t(mTp);
struct tm buf;
auto lTime = localtime_r(&lTp, &buf);
ret << mFunc << " '" << names.at(mStream) << "' = '" << mValue << "'";
ret << std::put_time(lTime, "%Y-%m-%d %H:%M:%S.") << std::setfill('0') << std::setw(3)
<< (std::chrono::duration_cast<std::chrono::milliseconds>(mTp.time_since_epoch()) % 1000)
.count()
<< " " << mFunc << " '" << names.at(mStream) << "' = '" << mValue << "'";
return ret.str();
}

View file

@ -71,6 +71,14 @@ static constexpr int32_t COMPOSE_PWLE_SIZE_MAX_DEFAULT = 127;
// See the LRA Calibration Support documentation for more details.
static constexpr int32_t Q14_BIT_SHIFT = 14;
// Measured ReDC. The LRA series resistance (ReDC), expressed as follows
// redc(ohms) = redc_measured / 2^Q15_BIT_SHIFT.
// This value represents the unit-specific ReDC input to the click compensation
// algorithm. It can be overwritten at a later time by writing to the redc_stored
// sysfs control.
// See the LRA Calibration Support documentation for more details.
static constexpr int32_t Q15_BIT_SHIFT = 15;
// Measured Q factor, q_measured, is represented by Q8.16 fixed
// point format on cs40l26 devices. The expression to calculate q is:
// q = q_measured / 2^Q16_BIT_SHIFT
@ -115,6 +123,10 @@ static uint16_t amplitudeToScale(float amplitude, float maximum) {
return std::round(ratio);
}
static float redcToFloat(std::string *caldata) {
return static_cast<float>(std::stoul(*caldata, nullptr, 16)) / (1 << Q15_BIT_SHIFT);
}
enum WaveformBankID : uint8_t {
RAM_WVFRM_BANK,
ROM_WVFRM_BANK,
@ -598,9 +610,12 @@ Vibrator::Vibrator(std::unique_ptr<HwApi> hwApiDefault, std::unique_ptr<HwCal> h
if (mHwCalDef->getF0(&caldata)) {
mHwApiDef->setF0(caldata);
mResonantFrequency =
static_cast<float>(std::stoul(caldata, nullptr, 16)) / (1 << Q14_BIT_SHIFT);
}
if (mHwCalDef->getRedc(&caldata)) {
mHwApiDef->setRedc(caldata);
mRedc = redcToFloat(&caldata);
}
if (mHwCalDef->getQ(&caldata)) {
mHwApiDef->setQ(caldata);
@ -1138,12 +1153,7 @@ ndk::ScopedAStatus Vibrator::alwaysOnDisable(int32_t /*id*/) {
}
ndk::ScopedAStatus Vibrator::getResonantFrequency(float *resonantFreqHz) {
std::string caldata{8, '0'};
if (!mHwCalDef->getF0(&caldata)) {
ALOGE("Failed to get resonant frequency (%d): %s", errno, strerror(errno));
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
}
*resonantFreqHz = static_cast<float>(std::stoul(caldata, nullptr, 16)) / (1 << Q14_BIT_SHIFT);
*resonantFreqHz = mResonantFrequency;
return ndk::ScopedAStatus::ok();
}
@ -1392,7 +1402,10 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
dprintf(fd, "AIDL:\n");
dprintf(fd, " Active Effect ID: %" PRId32 "\n", mActiveId);
dprintf(fd, " F0: %.02f\n", mResonantFrequency);
dprintf(fd, " F0 Offset: base: %" PRIu32 " flip: %" PRIu32 "\n", mF0Offset, mF0OffsetDual);
dprintf(fd, " Redc: %.02f\n", mRedc);
dprintf(fd, " Voltage Levels:\n");
dprintf(fd, " Tick Effect Min: %" PRIu32 " Max: %" PRIu32 "\n", mTickEffectVol[0],
@ -1464,7 +1477,73 @@ binder_status_t Vibrator::dump(int fd, const char **args, uint32_t numArgs) {
}
}
dprintf(fd, "\n");
dprintf(fd, "\n");
dprintf(fd, "Versions:\n");
std::ifstream verFile;
const auto verBinFileMode = std::ifstream::in | std::ifstream::binary;
std::string ver;
verFile.open("/sys/module/cs40l26_core/version");
if (verFile.is_open()) {
getline(verFile, ver);
dprintf(fd, " Haptics Driver: %s\n", ver.c_str());
verFile.close();
}
verFile.open("/sys/module/cl_dsp_core/version");
if (verFile.is_open()) {
getline(verFile, ver);
dprintf(fd, " DSP Driver: %s\n", ver.c_str());
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26.wmfw", verBinFileMode);
if (verFile.is_open()) {
verFile.seekg(113);
dprintf(fd, " cs40l26.wmfw: %d.%d.%d\n", verFile.get(), verFile.get(), verFile.get());
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26-calib.wmfw", verBinFileMode);
if (verFile.is_open()) {
verFile.seekg(113);
dprintf(fd, " cs40l26-calib.wmfw: %d.%d.%d\n", verFile.get(), verFile.get(),
verFile.get());
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26.bin", verBinFileMode);
if (verFile.is_open()) {
while (getline(verFile, ver)) {
auto pos = ver.find("Date: ");
if (pos != std::string::npos) {
ver = ver.substr(pos + 6, pos + 15);
dprintf(fd, " cs40l26.bin: %s\n", ver.c_str());
break;
}
}
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26-svc.bin", verBinFileMode);
if (verFile.is_open()) {
verFile.seekg(36);
getline(verFile, ver);
ver = ver.substr(ver.rfind('\\') + 1);
dprintf(fd, " cs40l26-svc.bin: %s\n", ver.c_str());
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26-calib.bin", verBinFileMode);
if (verFile.is_open()) {
verFile.seekg(36);
getline(verFile, ver);
ver = ver.substr(ver.rfind('\\') + 1);
dprintf(fd, " cs40l26-calib.bin: %s\n", ver.c_str());
verFile.close();
}
verFile.open("/vendor/firmware/cs40l26-dvl.bin", verBinFileMode);
if (verFile.is_open()) {
verFile.seekg(36);
getline(verFile, ver);
ver = ver.substr(0, ver.find('\0') + 1);
ver = ver.substr(ver.rfind('\\') + 1);
dprintf(fd, " cs40l26-dvl.bin: %s\n", ver.c_str());
verFile.close();
}
mHwApiDef->debug(fd);

View file

@ -242,6 +242,8 @@ class Vibrator : public BnVibrator {
float mLongEffectScale{1.0};
bool mIsChirpEnabled;
uint32_t mSupportedPrimitivesBits = 0x0;
float mRedc{0.0f};
float mResonantFrequency{0.0f};
std::vector<CompositePrimitive> mSupportedPrimitives;
std::vector<uint32_t> mPrimitiveMaxScale;
std::vector<uint32_t> mPrimitiveMinScale;