Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Return TotalMemory size when ddr size is not present" into udc-dev am: 6a9af3fd32

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

Change-Id: Id6835463f7e0b1fab2404976ea2ea77dd6d7912a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Juan Yescas
2023-05-10 00:16:06 +00:00
committed by Automerger Merge Worker
parent 2ff3b2a1db 6a9af3fd32
commit bff4a4d4f4
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/os/Process.java
View File

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

1
core/tests/coretests/src/android/os/ProcessTest.java
View File

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