Return TotalMemory size when ddr size is not present

When the ddr size is not present or it is invalid, getAdvertisedMem()
must return getTotalMemory() size.

Bug: 278977257
Test: atest frameworks/base/core/tests/coretests/src/android/os/ProcessTest.java
Merged-In: I2323d79d869a4c58eb29d0cae351144f357b867d
Change-Id: I2323d79d869a4c58eb29d0cae351144f357b867d
This commit is contained in:
Juan Yescas
2023-05-09 12:08:02 -07:00
parent 29fd4cf2d8
commit 34f1eab423
2 changed files with 2 additions and 1 deletions

View File

@@ -1359,7 +1359,7 @@ public class Process {
String formatSize = MemoryProperties.memory_ddr_size().orElse("0KB");
long memSize = FileUtils.parseSize(formatSize);
if (memSize == Long.MIN_VALUE) {
if (memSize <= 0) {
return FileUtils.roundStorageSize(getTotalMemory());
}

View File

@@ -73,6 +73,7 @@ public class ProcessTest extends TestCase {
}
public void testGetAdvertisedMem() {
assertTrue(Process.getAdvertisedMem() > 0);
assertTrue(Process.getTotalMemory() <= Process.getAdvertisedMem());
}
}