diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:01:02 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-29 20:01:02 +0000 |
| commit | 79f5fb828f7bc7607c0d3478d2c420f4b06f044b (patch) | |
| tree | 9db07fa72e8f7be9f45030d63b8740e5a2c16fda | |
| parent | 6ac150e85d351c3f63422a2011865f86d0d66cdc (diff) | |
| parent | 9c1d1a31b1a85f2fc484db07c46b4f7d28576bed (diff) | |
| download | bullhead-79f5fb828f7bc7607c0d3478d2c420f4b06f044b.tar.gz | |
release-request-99856c15-b008-4977-9971-f86523a23c0a-for-git_oc-m2-release-4367109 snap-temp-L18300000107415568
Change-Id: I6732b3e312f5860793656dd4dbb73732db793aba
| -rw-r--r-- | apns-full-conf.xml | 2 | ||||
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3Stream.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apns-full-conf.xml b/apns-full-conf.xml index 6080daa..99a8d3d 100644 --- a/apns-full-conf.xml +++ b/apns-full-conf.xml @@ -7259,6 +7259,7 @@ apn="pda.bell.ca" type="default,mms,supl" mmsc="http://mms.bell.ca/mms/wapenc" + protocol="IPV4V6" /> <apn carrier="Virgin Mobile" @@ -7269,6 +7270,7 @@ mmsc="http://mms.bell.ca/mms/wapenc" mvno_match_data="3E" mvno_type="gid" + protocol="IPV4V6" /> <apn carrier="MTS" diff --git a/camera/QCamera2/HAL3/QCamera3Stream.cpp b/camera/QCamera2/HAL3/QCamera3Stream.cpp index 399e73d..e87d1ec 100644 --- a/camera/QCamera2/HAL3/QCamera3Stream.cpp +++ b/camera/QCamera2/HAL3/QCamera3Stream.cpp @@ -588,9 +588,9 @@ void *QCamera3Stream::dataProcRoutine(void *data) break; case CAMERA_CMD_TYPE_EXIT: CDBG_HIGH("%s: Exit", __func__); + pme->flushFreeBatchBufQ(); /* flush data buf queue */ pme->mDataQ.flush(); - pme->flushFreeBatchBufQ(); running = 0; break; default: |