diff options
| author | Yabin Cui <yabinc@google.com> | 2021-11-24 11:39:12 -0800 |
|---|---|---|
| committer | Yabin Cui <yabinc@google.com> | 2021-11-24 11:39:12 -0800 |
| commit | fc080f5ebf37208024323941f7e086625f17b891 (patch) | |
| tree | bb4cea51b672368fe24b19d4d52530b59e1274c0 /simpleperf/scripts | |
| parent | 48aa243447438f9926dbdd73b796d22844649c60 (diff) | |
| download | extras-fc080f5ebf37208024323941f7e086625f17b891.tar.gz | |
simpleperf: Fix get_android_version in simpleperf_utils.py.
Property ro.build.version.release may contain non-digit characters,
like '12L'.
Bug: none
Test: test manually
Change-Id: I5dcd734f7e33b6484b6fee53d6a906e9ae7eefcf
Diffstat (limited to 'simpleperf/scripts')
| -rw-r--r-- | simpleperf/scripts/simpleperf_utils.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/simpleperf/scripts/simpleperf_utils.py b/simpleperf/scripts/simpleperf_utils.py index 05526237..de6a84c5 100644 --- a/simpleperf/scripts/simpleperf_utils.py +++ b/simpleperf/scripts/simpleperf_utils.py @@ -369,14 +369,15 @@ class AdbHelper(object): build_version = self.get_property('ro.build.version.release') android_version = 0 if build_version: - if not build_version[0].isdigit(): + if build_version[0].isdigit(): + i = 1 + while i < len(build_version) and build_version[i].isdigit(): + i += 1 + android_version = int(build_version[:i]) + else: c = build_version[0].upper() if c.isupper() and c >= 'L': android_version = ord(c) - ord('L') + 5 - else: - strs = build_version.split('.') - if strs: - android_version = int(strs[0]) return android_version |