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

1 files changed, 5 insertions, 3 deletions

diff --git a/core/java/android/os/SharedMemory.java b/core/java/android/os/SharedMemory.java
index a15b3bbd9b4e..46ae9d8682ee 100644
--- a/core/java/android/os/SharedMemory.java
+++ b/core/java/android/os/SharedMemory.java
@@ -381,9 +381,11 @@ public final class SharedMemory implements Parcelable, Closeable {
         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;