commit b7ab38e10e1f0d3088153f070e681e34263d393c
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Aug 29 23:31:34 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Aug 29 23:31:34 2024 +0000
tree 8c2050af48857eab07fb03c23b35dbce8c861683
parent ec3810476fa9f0a3e1e7472bc7e2e6c5dba5ed04
parent 76872602c5661fcb97ab6baabe086f5773775def

Merge "Fix SharedMemory.MemoryRegistration.size calculation when PAGE_SIZE is 0." into main

core/java/android/os/SharedMemory.java

diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java
index a15b3bb..46ae9d8 100644
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -381,9 +381,11 @@
         private MemoryRegistration(int size) {
             // Round up to the nearest page size
             final int PAGE_SIZE = OsConstants._SC_PAGE_SIZE;
-            final int remainder = size % PAGE_SIZE;
-            if (remainder != 0) {
-                size += PAGE_SIZE - remainder;
+            if (PAGE_SIZE > 0) {
+                final int remainder = size % PAGE_SIZE;
+                if (remainder != 0) {
+                    size += PAGE_SIZE - remainder;
+                }
             }
             mSize = size;
             mReferenceCount = 1;