| commit | 91ea3f46d5fdb101e068b953124ca230d9c78daf | [log] [tgz] |
|---|---|---|
| author | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 16:09:03 2015 +0000 |
| committer | Nicholas Sauer <nicksauer@google.com> | Tue Aug 25 16:10:23 2015 +0000 |
| tree | b4ea7971433a4482dad439206ad179e058387751 | |
| parent | 1135c29ec4b7b33446f6e45bb2a76a309ab39fc9 [diff] |
Revert "Revert "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH"" The build error is fixed in ag/755227 bug: 23003940 This reverts commit 1135c29ec4b7b33446f6e45bb2a76a309ab39fc9. Change-Id: I548b110805f2efdb1731814897e1e6a2fb3878e4
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java index 8fb61bf..4ba1160d 100644 --- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java +++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
@@ -50,6 +50,8 @@ public static final String RESOLUTION = "resolution"; public static final String VERSION_SDK = "androidPlatformVersion"; public static final String VERSION_RELEASE = "buildVersion"; + public static final String VERSION_BASE_OS = "base_os"; + public static final String VERSION_SECURITY_PATCH = "security_patch"; public static final String BUILD_ABI = "build_abi"; public static final String BUILD_ABI2 = "build_abi2"; public static final String BUILD_ABIS = "build_abis";
diff --git a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java index 5828259..51da850 100644 --- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java +++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -80,6 +80,8 @@ addResult(VERSION_RELEASE, Build.VERSION.RELEASE); addResult(VERSION_SDK, Build.VERSION.SDK); + addResult(VERSION_BASE_OS, Build.VERSION.BASE_OS); + addResult(VERSION_SECURITY_PATCH, Build.VERSION.SECURITY_PATCH); DisplayMetrics metrics = new DisplayMetrics(); WindowManager wm = (WindowManager) getContext().getSystemService(