From a9889aafd729a11da9aac2db66f90aa7a32c3b8a Mon Sep 17 00:00:00 2001 From: Cong Lin Date: Fri, 13 Mar 2020 14:12:09 -0700 Subject: [PATCH] Remove the access to net.hostname Merge of http://go/wvgerrit/95723 This is to remove the reference to net.hostname in get_unique_id_android.cpp for L3. Keep ro.serialno, and just change the net.hostname call to setting the constant string. Bug: 130028203 Test: Ran unit tests Change-Id: I90d955c117924c16c71f145dea53fe32644d2875 --- libwvdrmengine/level3/src/get_unique_id_android.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libwvdrmengine/level3/src/get_unique_id_android.cpp b/libwvdrmengine/level3/src/get_unique_id_android.cpp index e63abc5a..8df8ef8d 100644 --- a/libwvdrmengine/level3/src/get_unique_id_android.cpp +++ b/libwvdrmengine/level3/src/get_unique_id_android.cpp @@ -16,10 +16,7 @@ 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"); - } + unique_id = android::base::GetProperty("ro.serialno", "0123456789abc"); #if defined(IN_APP_FASTBALL) || defined(IN_APP_MOVIES) unique_id += android::base::GetProperty("package.name", "com.google.inapp"); #endif