Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapt sn key to ro.factory.psn and screen density key to ro.sf.lcd_density #1

Merged
merged 2 commits into from
Feb 20, 2025
Merged

Adapt sn key to ro.factory.psn and screen density key to ro.sf.lcd_density #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e67b7df
adapt sn key to ro.factory.psn
WenLY1 Feb 20, 2025
fc7561b
adapt screen density key to ro.sf.lcd_density and express screen dens…
WenLY1 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/uv_devinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@
#include <sys/utsname.h>
#include <uv_ext.h>

#define CONFIG_FACT_WIFIMAC_KEY "ro.factory.mac_wifi"
#define CONFIG_FACT_SN_KEY "ro.factory.psn"
#define CONFIG_DEVICE_BRAND_KEY "ro.product.brand"
#define CONFIG_DEVICE_MODEL_KEY "ro.product.model"
#define CONFIG_DEVICE_PRODUCT_KEY "ro.product.name"
#define CONFIG_DEVICE_MANUFACTURER_KEY "ro.product.manufacturer"
#define CONFIG_DEVICE_DEVICETYPE_KEY "ro.product.device.devicetype"
#define CONFIG_DEVICE_SCREENSHAPE_KEY "ro.product.device.screenshape"
#define CONFIG_DEVICE_SCREENDENSITY_KEY "ro.product.device.screendensity"
#define CONFIG_DEVICE_SCREENDENSITY_KEY "ro.sf.lcd_density"
#define CONFIG_DEVICE_LANGUAGE_KEY "ro.system.language"
#define CONFIG_DEVICE_REGION_KEY "ro.system.region"
#define CONFIG_DEVICE_OSVERSIONCODE_KEY "ro.system.osversioncode"
Expand Down Expand Up @@ -200,7 +200,7 @@ int uv_devinfobuff(char* buff, int size, int item)
#if defined(CONFIG_KVDB) && defined(CONFIG_CRYPTO_MBEDTLS)
uv_buf_t input, output, ret;
char kvbuf[PROP_VALUE_MAX] = { 0 };
property_get(CONFIG_FACT_WIFIMAC_KEY, kvbuf, "NA");
property_get(CONFIG_FACT_SN_KEY, kvbuf, "NA");
strlcpy(buff, kvbuf, size);
input.base = (char*)buff;
input.len = strlen(buff);
Expand All @@ -217,7 +217,7 @@ int uv_devinfobuff(char* buff, int size, int item)
case UV_EXT_DEVINFO_SERIAL: {
#if defined(CONFIG_KVDB) && defined(CONFIG_CRYPTO_MBEDTLS)
char kvbuf[PROP_VALUE_MAX] = { 0 };
property_get(CONFIG_FACT_WIFIMAC_KEY, kvbuf, "NA");
property_get(CONFIG_FACT_SN_KEY, kvbuf, "NA");
strlcpy(buff, kvbuf, size);
#endif
break;
Expand Down Expand Up @@ -313,8 +313,8 @@ int uv_getdeviceinfo(uv_devinfo_t* info)

info->osversioncode = property_get_int32(CONFIG_DEVICE_OSVERSIONCODE_KEY, CONFIG_VERSION);

property_get(CONFIG_DEVICE_SCREENDENSITY_KEY, kvbuf, "1.0");
info->screendensity = atof(kvbuf);
property_get(CONFIG_DEVICE_SCREENDENSITY_KEY, kvbuf, "160.0");
info->screendensity = (int)((atof(kvbuf) / 16.0 + 0.5)) / 10.0;

DEVICE_PROPERTY_GET(CONFIG_DEVICE_SCREENSHAPE_KEY, info->screenshape, "unknown");
DEVICE_PROPERTY_GET(CONFIG_DEVICE_DEVICETYPE_KEY, info->devicetype, "unknown");
Expand All @@ -333,7 +333,7 @@ int uv_getdeviceinfo(uv_devinfo_t* info)
{
uv_buf_t input, output, ret;
char kvbuf[PROP_VALUE_MAX] = { 0 };
property_get(CONFIG_FACT_WIFIMAC_KEY, kvbuf, "NA");
property_get(CONFIG_FACT_SN_KEY, kvbuf, "NA");
strlcpy(info->did, kvbuf, sizeof(info->did));
input.base = (char*)info->did;
input.len = strlen(info->did);
Expand Down Expand Up @@ -372,4 +372,4 @@ int uv_getdeviceinfo(uv_devinfo_t* info)

#endif
return ret;
}
}
Loading