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:
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
@@ -73,6 +73,7 @@ public class ProcessTest extends TestCase {
|
||||
}
|
||||
|
||||
public void testGetAdvertisedMem() {
|
||||
assertTrue(Process.getAdvertisedMem() > 0);
|
||||
assertTrue(Process.getTotalMemory() <= Process.getAdvertisedMem());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user