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

Commit 634c0b6f 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" into udc-dev am: 6a9af3fd 

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



Change-Id: Icbc1e2020c8f1f5103628699ca9e10dea2393eb5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8d2e32ed 6a9af3fd

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());

    }

}