Merge "Remove unnecessary code." into jb-mr1-dev

Jeff Brown · Android (Google) Code Review · commit fbe963f4ad80 · 2012-08-02T21:36:33.000-07:00
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java
@@ -292,11 +292,6 @@ public void getMetrics(DisplayMetrics outMetrics) {
             updateDisplayInfoLocked();
             mDisplayInfo.getAppMetrics(outMetrics, mCompatibilityInfo);
         }
-
-        final CompatibilityInfo ci = mCompatibilityInfo.getIfNeeded();
-        if (ci != null) {
-            ci.applyToDisplayMetrics(outMetrics);
-        }
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -292,11 +292,6 @@ public void getMetrics(DisplayMetrics outMetrics) {`
`292`	`292`	`updateDisplayInfoLocked();`
`293`	`293`	`mDisplayInfo.getAppMetrics(outMetrics, mCompatibilityInfo);`
`294`	`294`	`}`
`295`		`-`
`296`		`- final CompatibilityInfo ci = mCompatibilityInfo.getIfNeeded();`
`297`		`- if (ci != null) {`
`298`		`- ci.applyToDisplayMetrics(outMetrics);`
`299`		`- }`
`300`	`295`	`}`
`301`	`296`
`302`	`297`	`/**`