| commit | c35fa04e69f33372df23031a0bf492d2798be349 | [log] [tgz] |
|---|---|---|
| author | Stuart Scott <stuartscott@google.com> | Tue Feb 16 22:20:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Feb 16 22:20:36 2016 +0000 |
| tree | 2b0ed5705d0c83b4f11d4c332c9892aac67c6da2 | |
| parent | b8b0b5e54c6b7983b093bac16174c695be00a496 [diff] | |
| parent | aaefcf8af59c6c3891a060e34ac7ad653e80b33e [diff] |
Merge "resolve merge conflicts of b9cf2528d9 to marshmallow-cts-dev" into marshmallow-cts-dev am: aaefcf8af5 * commit 'aaefcf8af59c6c3891a060e34ac7ad653e80b33e': collect available_processors in device info
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 c336d3c..24cff32 100644 --- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java +++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoConstants.java
@@ -78,4 +78,5 @@ public static final String TOTAL_MEMORY = "total_memory"; public static final String REFERENCE_BUILD_FINGERPRINT = "reference_build_fingerprint"; + public static final String AVAILABLE_PROCESSORS = "available_processors"; }
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 37f8558..b752c91 100644 --- a/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java +++ b/tools/device-setup/TestDeviceSetup/src/android/tests/getinfo/DeviceInfoInstrument.java
@@ -169,6 +169,9 @@ addResult(LARGE_MEMORY_CLASS, getLargeMemoryClass()); addResult(TOTAL_MEMORY, getTotalMemory()); + // CPU Info + addResult(AVAILABLE_PROCESSORS, Runtime.getRuntime().availableProcessors()); + finish(Activity.RESULT_OK, mResults); }