diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
index d11136ec98222..d484f4d47e990 100644
--- a/core/java/android/view/Display.java
+++ b/core/java/android/view/Display.java
@@ -1203,7 +1203,10 @@ public final class Display {
      */
     @Nullable
     public DeviceProductInfo getDeviceProductInfo() {
-        return mDisplayInfo.deviceProductInfo;
+        synchronized (mLock) {
+            updateDisplayInfoLocked();
+            return mDisplayInfo.deviceProductInfo;
+        }
     }
 
     /**