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

Commit fe549800 authored by Angus Kong's avatar Angus Kong
Browse files

Handle InterruptedException in waitDone 

Dirty bit for mParameters should be set properly if getParameters is not
finished.

bug:8517092
Change-Id: I2259dc978465d23bff9c6852bec4a791f94137d0
parent 36cac0c2

src/com/android/camera/CameraManager.java

+14 −4
Original line number Diff line number Diff line
@@ -420,12 +420,20 @@ public class CameraManager { 
        }



        public void setParameters(Parameters params) {

            // TODO: check if this synchronous version is necessary

            if (params == null) {

                Log.v(TAG, "null parameters in setParameters()");

                return;

            }

            mParametersIsDirty = true;

            mCameraHandler.obtainMessage(SET_PARAMETERS, params).sendToTarget();

        }



        public void setParametersAsync(Parameters params) {

            // TODO: remove this.

            if (params == null) {

                Log.v(TAG, "null parameters in setParameters()");

                return;

            }

            mParametersIsDirty = true;

            mCameraHandler.removeMessages(SET_PARAMETERS_ASYNC);

            mCameraHandler.obtainMessage(SET_PARAMETERS_ASYNC, params).sendToTarget();
@@ -434,8 +442,7 @@ public class CameraManager { 
        public Parameters getParameters() {

            if (mParametersIsDirty || mParameters == null) {

                mCameraHandler.sendEmptyMessage(GET_PARAMETERS);

                waitDone();

                mParametersIsDirty = false;

                if (waitDone()) mParametersIsDirty = false;

            }

            return mParameters;

        }
@@ -445,7 +452,8 @@ public class CameraManager { 
                    ENABLE_SHUTTER_SOUND, (enable ? 1 : 0), 0).sendToTarget();

        }



        public void waitDone() {

        // return false if cancelled.

        public boolean waitDone() {

            final Object waitDoneLock = new Object();

            final Runnable unlockRunnable = new Runnable() {

                @Override
@@ -462,8 +470,10 @@ public class CameraManager { 
                    waitDoneLock.wait();

                } catch (InterruptedException ex) {

                    Log.v(TAG, "waitDone interrupted");

                    return false;

                }

            }

            return true;

        }

    }

}