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

am: f98d5cb38b

Change-Id: Id24b3456d69a03557382023ddcff6ebd4aa3cc9e
This commit is contained in:
Daichi Hirono
2018-09-10 20:09:40 -07:00
committed by android-build-merger

View File

@@ -575,9 +575,7 @@ public class Camera {
/** /**
* An empty Camera for testing purpose. * An empty Camera for testing purpose.
*/ */
Camera() { Camera() {}
initAppOps();
}
private void initAppOps() { private void initAppOps() {
IBinder b = ServiceManager.getService(Context.APP_OPS_SERVICE); IBinder b = ServiceManager.getService(Context.APP_OPS_SERVICE);