From 8530853158cf6b12023c47430fdffda5668d545b Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 1 Aug 2018 16:39:22 -0700
Subject: Remove unneccessary #isHardwareAccelerated

Test: CameraTests#testBasicTranslate
Change-Id: I2b5378edc3c975609bd1b427eac5677f87f601ac
---
 graphics/java/android/graphics/Camera.java | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'graphics/java')

diff --git a/graphics/java/android/graphics/Camera.java b/graphics/java/android/graphics/Camera.java
index 60588d07196c..008991a1e483 100644
--- a/graphics/java/android/graphics/Camera.java
+++ b/graphics/java/android/graphics/Camera.java
@@ -22,8 +22,6 @@ package android.graphics;
  * {@link Canvas}.
  */
 public class Camera {
-    private Matrix mMatrix;
-
     /**
      * Creates a new camera, with empty transformations.
      */
@@ -149,13 +147,7 @@ public class Camera {
      * @param canvas The Canvas to set the transform matrix onto
      */
     public void applyToCanvas(Canvas canvas) {
-        if (canvas.isHardwareAccelerated()) {
-            if (mMatrix == null) mMatrix = new Matrix();
-            getMatrix(mMatrix);
-            canvas.concat(mMatrix);
-        } else {
-            nativeApplyToCanvas(canvas.getNativeCanvasWrapper());
-        }
+        nativeApplyToCanvas(canvas.getNativeCanvasWrapper());
     }
 
     public native float dotWithNormal(float dx, float dy, float dz);
-- 
cgit v1.2.3-59-g8ed1b