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

Commit ff3b9469 authored by Juan Yescas's avatar Juan Yescas Committed by Automerger Merge Worker
Browse files

Merge "Return TotalMemory size when ddr size is not present" am: 24e934c0 am: c1029121 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2583778



Change-Id: I94b51b86f028d7f19171aeca827cfe59f5d404a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bf92c0be c1029121

core/java/android/os/Process.java

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

    }

}