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

Add TW_USE_MODEL_HADWARE_ID_FOR_DEVICE_ID parameter for correct model identification

Browse Source 
Change-Id: Ic6440c624b5cfbdb0f24681461748a0da16bf95e
This commit is contained in:
Anatoly Smaznov
2013-02-12 13:33:40 +07:00
committed by Dees_Troy
parent e42845962d
commit 10c11f67cf
2 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
data.cpp
View File

@@ -41,6 +41,10 @@
#include "partitions.hpp"
#include "twrp-functions.hpp"
#ifdef TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID
#include "cutils/properties.h"
#endif
extern "C"
{
#include "common.h"
@@ -90,6 +94,30 @@ void DataManager::get_device_id(void) {
// Assign a blank device_id to start with
device_id[0] = 0;
#ifdef TW_USE_MODEL_HARDWARE_ID_FOR_DEVICE_ID
// Now we'll use product_model_hardwareid as device id
char model_id[PROPERTY_VALUE_MAX];
property_get("ro.product.model", model_id, "error");
if (strcmp(model_id,"error") != 0) {
LOGI("=> product model: '%s'\n", model_id);
// Replace spaces with underscores
for(int i = 0; i < strlen(model_id); i++) {
if(model_id[i] == ' ')
model_id[i] = '_';
}
strcpy(device_id, model_id);
if (hardware_id[0] != 0) {
strcat(device_id, "_");
strcat(device_id, hardware_id);
}
sanitize_device_id((char *)device_id);
mConstValues.insert(make_pair("device_id", device_id));
LOGI("=> using device id: '%s'\n", device_id);
return;
}
#endif
#ifndef TW_FORCE_CPUINFO_FOR_DEVICE_ID
// First, try the cmdline to see if the serial number was supplied
fp = fopen("/proc/cmdline", "rt");