Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ef01737 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala
Browse files

CameraManager: Ensure all public methods connect to camera service. 

Otherwise, registerAvailabilityCallback won't actually cause caller to
receive callbacks, if no other methods on CameraManager are ever
invoked.

Bug: 21536556
Change-Id: I5cded8a59846a971d6272ac3bced44678a533165
parent 85f4b7b3

core/java/android/hardware/camera2/CameraManager.java

+12 −6
Original line number Diff line number Diff line
@@ -802,24 +802,26 @@ public final class CameraManager { 
         */

        public ICameraService getCameraService() {

            synchronized(mLock) {

                if (mCameraService == null) {

                    Log.i(TAG, "getCameraService: Reconnecting to camera service");

                connectCameraServiceLocked();

                if (mCameraService == null) {

                    Log.e(TAG, "Camera service is unavailable");

                }

                }

                return mCameraService;

            }

        }



        /**

         * Connect to the camera service if it's available, and set up listeners.

         * If the service is already connected, do nothing.

         *

         * <p>Sets mCameraService to a valid pointer or null if the connection does not succeed.</p>

         */

        private void connectCameraServiceLocked() {

            mCameraService = null;

            // Only reconnect if necessary

            if (mCameraService != null) return;



            Log.i(TAG, "Connecting to camera service");



            IBinder cameraServiceBinder = ServiceManager.getService(CAMERA_SERVICE_BINDER_NAME);

            if (cameraServiceBinder == null) {

                // Camera service is now down, leave mCameraService as null
@@ -1098,6 +1100,8 @@ public final class CameraManager { 
         */

        public void registerAvailabilityCallback(AvailabilityCallback callback, Handler handler) {

            synchronized (mLock) {

                connectCameraServiceLocked();



                Handler oldHandler = mCallbackMap.put(callback, handler);

                // For new callbacks, provide initial availability information

                if (oldHandler == null) {
@@ -1120,6 +1124,8 @@ public final class CameraManager { 


        public void registerTorchCallback(TorchCallback callback, Handler handler) {

            synchronized(mLock) {

                connectCameraServiceLocked();



                Handler oldHandler = mTorchCallbackMap.put(callback, handler);

                // For new callbacks, provide initial torch information

                if (oldHandler == null) {