Merge "Stop invoke initAppOps in Camera default constructor."

am: 0890a2b51e Change-Id: I6ed52f595757c3ca7308969105f05e6bd55dee65
2018-09-10 20:00:30 -07:00
parent 1b2deff317 0890a2b51e
commit f98d5cb38b
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);