Camera2: add missing 4MP option string

Change-Id: I1b46b7ebaebb6d9a85ea546acde9eea9231d5c1f
Camera2: Do not issue autofocus cancel if preview stopped

942890667aa08cc3c1305d7ba64c1340df1219db introduced the option to not
issue autofocus cancel if the preview was stopped. Extend it to the case
where the preview is stopped because the camera was called as an intent
(ie from MMS client)

Change-Id: I30032d8375665ecf6be471bf480c1f118d25423b
Revert "Camera: Overrides the focus mode for ZSL"

This reverts commit 348d34ec72b6d76b4bce15d2f070da034927018d.

Change-Id: I45724e3039646a0694b68cfd3892273ec3d959f2
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Camera: Don't do cancel_af till all CBs are received in burst shot

Doing cancel_af in the first jpeg CB while
burst shot is going on, is changing the
camera state to IDLE and allowing next
takePicture() which is resulting in crash
as this call reaches HAL when camera is in
picture taking state.

Change-Id: Idd146060a73161bcc30c34756fb53662bb1f0902
CRs-Fixed: 593352
Fix up some things

Change-Id: I1a5eb4bbefc6986d321950dde03b355dde56eeba
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>
Update settings pref values when BSM is not auto.

When BSM mode is set to a value other than auto, flash mode, white
balance and few more settings will not be based on user preferred
settings. So mParameter object will have default values. Updating
those values in the list will over write the preferences.
To preserve settings from preferences, we need to pass the same
values.

CRs-Fixed: 573584
Change-Id: Ic62dc537250468f189374fae9a897ee46d40e3a1
Port Focus timer from CM

  *Thanks

Change-Id: Ib9c7d2bff6bebde5033678a3e7e3679a5577ce25
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>