am 36dd6e63: am 33416a93: Merge "Disable density scaling for HW canvas" into mnc-dev

* commit '36dd6e63fe520666272af1f9784adc4a450112e3':
  Disable density scaling for HW canvas

core/java/android/view/DisplayListCanvas.java

@@ -89,6 +89,7 @@ public class DisplayListCanvas extends Canvas {
 
     private DisplayListCanvas() {
         super(nCreateDisplayListCanvas());
+        mDensity = 0; // disable bitmap density scaling
     }
 
     private static native long nCreateDisplayListCanvas();
@@ -97,6 +98,12 @@ public class DisplayListCanvas extends Canvas {
     // Canvas management
     ///////////////////////////////////////////////////////////////////////////
 
+
+    @Override
+    public void setDensity(int density) {
+        // drop silently, since DisplayListCanvas doesn't perform density scaling
+    }
+
     @Override
     public boolean isHardwareAccelerated() {
         return true;