Merge "Stop invoke initAppOps in Camera default constructor." am: 0890a2b51e

am: f98d5cb38b Change-Id: Id24b3456d69a03557382023ddcff6ebd4aa3cc9e
2018-09-10 20:09:40 -07:00
parent e2d9760c23 f98d5cb38b
commit 39a305ea21
1 changed files with 1 additions and 3 deletions
--- 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);