diff options
| author | lambdadroid <lambdadroid@gmail.com> | 2017-08-04 17:16:53 +0200 |
|---|---|---|
| committer | lambdadroid <lambdadroid@gmail.com> | 2018-09-26 23:53:28 +0200 |
| commit | fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda (patch) | |
| tree | 85bda5c58d67531ab0c140a79bda753058df3a75 | |
| parent | Fix header file for property_get (diff) | |
| download | android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar.gz android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar.bz2 android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar.lz android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar.xz android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.tar.zst android_bootable_recovery-fc0b16df8ba6a4d79e4cc8ad598e1d59a8ac4fda.zip | |
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | data.cpp | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk index cacd783bb..8ed4c6c3f 100644 --- a/Android.mk +++ b/Android.mk @@ -315,6 +315,9 @@ WITH_CRYPTO_UTILS := \ ifeq ($(TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID), true) LOCAL_CFLAGS += -DTW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID endif +ifeq ($(TW_USE_SERIALNO_PROPERTY_FOR_DEVICE_ID), true) + LOCAL_CFLAGS += -DTW_USE_SERIALNO_PROPERTY_FOR_DEVICE_ID +endif ifneq ($(TW_BRIGHTNESS_PATH),) LOCAL_CFLAGS += -DTW_BRIGHTNESS_PATH=$(TW_BRIGHTNESS_PATH) endif @@ -146,6 +146,16 @@ void DataManager::get_device_id(void) { #endif #ifndef TW_FORCE_CPUINFO_FOR_DEVICE_ID +#ifdef TW_USE_SERIALNO_PROPERTY_FOR_DEVICE_ID + // Check serial number system property + if (property_get("ro.serialno", line, "")) { + snprintf(device_id, DEVID_MAX, "%s", line); + sanitize_device_id(device_id); + mConst.SetValue("device_id", device_id); + return; + } +#endif + // Check the cmdline to see if the serial number was supplied fp = fopen("/proc/cmdline", "rt"); if (fp != NULL) { |