Merge "Merge Android 12"

1 files changed, 2 insertions, 2 deletions

diff --git a/core/java/android/util/DisplayMetrics.java b/core/java/android/util/DisplayMetrics.java
index 9f6065e695c5..0a3e6b1cff38 100755
--- a/core/java/android/util/DisplayMetrics.java
+++ b/core/java/android/util/DisplayMetrics.java
@@ -16,10 +16,10 @@
 
 package android.util;
 
+import android.annotation.Nullable;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.os.SystemProperties;
 
-
 /**
  * A structure describing general information about a display, such as its
  * size, density, and font scaling.
@@ -362,7 +362,7 @@ public class DisplayMetrics {
     }
 
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(@Nullable Object o) {
         return o instanceof DisplayMetrics && equals((DisplayMetrics)o);
     }