diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 132e486..0b50aa2 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -4526,17 +4526,17 @@
     }
 
     @Override
-    public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution) {
+    public ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean isLowResolution) {
         enforceCallerIsRecentsOrHasPermission(READ_FRAME_BUFFER, "getTaskSnapshot()");
         final long ident = Binder.clearCallingIdentity();
         try {
-            return getTaskSnapshot(taskId, reducedResolution, true /* restoreFromDisk */);
+            return getTaskSnapshot(taskId, isLowResolution, true /* restoreFromDisk */);
         } finally {
             Binder.restoreCallingIdentity(ident);
         }
     }
 
-    private ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean reducedResolution,
+    private ActivityManager.TaskSnapshot getTaskSnapshot(int taskId, boolean isLowResolution,
             boolean restoreFromDisk) {
         final Task task;
         synchronized (mGlobalLock) {
@@ -4548,7 +4548,7 @@
             }
         }
         // Don't call this while holding the lock as this operation might hit the disk.
-        return task.getSnapshot(reducedResolution, restoreFromDisk);
+        return task.getSnapshot(isLowResolution, restoreFromDisk);
     }
 
     @Override
@@ -7491,8 +7491,8 @@
 
         @Override
         public ActivityManager.TaskSnapshot getTaskSnapshotNoRestore(int taskId,
-                boolean reducedResolution) {
-            return ActivityTaskManagerService.this.getTaskSnapshot(taskId, reducedResolution,
+                boolean isLowResolution) {
+            return ActivityTaskManagerService.this.getTaskSnapshot(taskId, isLowResolution,
                     false /* restoreFromDisk */);
         }
 
