Merge "Stop invoke initAppOps in Camera default constructor."

am: 0890a2b51e

Change-Id: I6ed52f595757c3ca7308969105f05e6bd55dee65

1 files changed, 1 insertions, 3 deletions

diff --git a/core/java/android/hardware/Camera.java b/core/java/android/hardware/Camera.java
index d8cdf60ad850..8e96f56e8cd3 100644
--- a/core/java/android/hardware/Camera.java
+++ b/core/java/android/hardware/Camera.java
@@ -575,9 +575,7 @@ public class Camera {
     /**
      * An empty Camera for testing purpose.
      */
-    Camera() {
-        initAppOps();
-    }
+    Camera() {}
 
     private void initAppOps() {
         IBinder b = ServiceManager.getService(Context.APP_OPS_SERVICE);