Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34f1eab4 authored by Juan Yescas's avatar Juan Yescas
Browse files

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
parent 29fd4cf2

core/java/android/os/Process.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

        }

core/tests/coretests/src/android/os/ProcessTest.java

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ public class ProcessTest extends TestCase { 
    }



    public void testGetAdvertisedMem() {

        assertTrue(Process.getAdvertisedMem() > 0);

        assertTrue(Process.getTotalMemory() <= Process.getAdvertisedMem());

    }

}