PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add option to use ro.serialno for generating device id" into android-9.0

Browse Source
This commit is contained in:
big biff
2018-12-24 01:45:46 +01:00
committed by Gerrit Code Review
parent 4780286346 fc0b16df8b
commit cbd8cc5e06
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Android.mk
+3
View File
@@ -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
data.cpp
+10
View File
@@ -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) {