From b09d06fcf727da37abdbd09f1d222da5a3a9eb18 Mon Sep 17 00:00:00 2001 From: volzhs Date: Tue, 20 Mar 2018 13:53:33 +0900 Subject: [PATCH] Fix getting Android device information Fix #17644 (cherry picked from commit 4e378aeeb874b596fa08d079d9e107b2863f1144) --- platform/android/export/export.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 6b4d0ff8c49..6d9f0a7e9a2 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -301,8 +301,7 @@ class EditorExportAndroid : public EditorExportPlatform { args.push_back("-s"); args.push_back(d.id); args.push_back("shell"); - args.push_back("cat"); - args.push_back("/system/build.prop"); + args.push_back("getprop"); int ec; String dp; @@ -315,7 +314,14 @@ class EditorExportAndroid : public EditorExportPlatform { d.api_level = 0; for (int j = 0; j < props.size(); j++) { + // got information by `shell cat /system/build.prop` before and its format is "property=value" + // it's now changed to use `shell getporp` because of permission issue with Android 8.0 and above + // its format is "[property]: [value]" so changed it as like build.prop String p = props[j]; + p = p.replace("]: ", "="); + p = p.replace("[", ""); + p = p.replace("]", ""); + if (p.begins_with("ro.product.model=")) { device = p.get_slice("=", 1).strip_edges(); } else if (p.begins_with("ro.product.brand=")) {