ef00d6ffa5
[ Merge of http://go/wvgerrit/70203 ] The earlier property_get() method had a limitation on property length. Properties of some new devices exceed that length. An error message is returned rather than a truncated string. Replace its use with android::base::GetProperty() which does not have a length limitation. Bug: 115358798 Test: WV unit/integration tests Change-Id: I46ce9a7e77bcd031225d0082f83c57d484fe5405
31 lines
771 B
C++
31 lines
771 B
C++
#include "level3.h"
|
|
|
|
#include <string.h>
|
|
|
|
#include <string>
|
|
|
|
// The function property_get is defined differently if it comes from the IN_APP
|
|
// version or from the Android OS.
|
|
#if defined(IN_APP_FASTBALL)
|
|
#include "properties_fastball.h"
|
|
#else
|
|
#include <android-base/properties.h>
|
|
#endif
|
|
|
|
namespace wvoec3 {
|
|
|
|
const char *getUniqueID(size_t *len) {
|
|
static std::string unique_id;
|
|
unique_id = android::base::GetProperty("ro.serialno", "");
|
|
if (unique_id.empty()) {
|
|
unique_id = android::base::GetProperty("net.hostname", "0123456789abc");
|
|
}
|
|
#if defined(IN_APP_FASTBALL) || defined(IN_APP_MOVIES)
|
|
unique_id += android::base::GetProperty("package.name", "com.google.inapp");
|
|
#endif
|
|
*len = unique_id.size();
|
|
return unique_id.c_str();
|
|
}
|
|
|
|
} // namespace wvoec3
|