commit | 59eaf9216ef178c28f6fee23babbb211be35b836 | [log] [tgz] |
---|---|---|
author | Nicholas Sauer <nicksauer@google.com> | Mon Aug 24 17:55:36 2015 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Aug 24 17:55:36 2015 +0000 |
tree | d81fb3c7fb3fa3244ee2b094ac4771c4f25bb087 | |
parent | 4db04227c052aaec075dd89a5483ebc27da47ad9 [diff] | |
parent | 84df94cf1898a8115915b5248728671c41e479e4 [diff] |
Merge "Capture Build.Version.BASE_OS and Build.Verison.SECURITY_PATCH" into mnc-dev
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(