commit a3bed43cef3d7d21ca337bb014549c2a4b4d85f1
author Daniel Xie <dxie@google.com> Fri Jul 10 18:11:45 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 10 18:11:45 2015 +0000
tree bc3f6b0b1faf01f161906ea1049d10be239e658f
parent 87e7ec02faa90fe937c8fc7c14612fbb37ba29e1
parent 2c9e5e39dfb7f43101e7d901e9ad13a6966a0c33

am 2c9e5e39: am ba3d0a07: am fff9d5a3: am 448ebfff: am 13927d10: am e6e19944: am a18e1fce: Merge "Modify the testcase in 64-bit device & lower density field" into lollipop-mr1-cts-dev

* commit '2c9e5e39dfb7f43101e7d901e9ad13a6966a0c33':
  Modify the testcase in 64-bit device & lower density field

tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java

diff --git a/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java b/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java
index 0a0607d..18796d4 100755
--- a/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/LowRamDeviceTest.java
@@ -92,8 +92,11 @@
                 lessThanDpi(density, DENSITY_MEDIUM, screenSize, SCREENLAYOUT_SIZE_LARGE) ||
                 lessThanDpi(density, DENSITY_LOW, screenSize, SCREENLAYOUT_SIZE_XLARGE)) {
 
-            assertFalse("Device is not expected to be 64-bit", supports64Bit);
-            assertMinMemoryMb(424);
+            if (supports64Bit) {
+                assertMinMemoryMb(704);
+            } else {
+                assertMinMemoryMb(424);
+            }
         } else if (greaterThanDpi(density, DENSITY_XHIGH, screenSize,
                 SCREENLAYOUT_SIZE_NORMAL, SCREENLAYOUT_SIZE_SMALL) ||
                 greaterThanDpi(density, DENSITY_TV, screenSize, SCREENLAYOUT_SIZE_LARGE) ||