Merge pull request #637 from TakayukiHoshi1984/bugfix_android_10_camera

Android10でのCamera周りの挙動修正

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/camera/CameraWrapper.java

@@ -23,6 +23,7 @@
 import android.media.ImageReader;
 import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.Looper;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
@@ -79,8 +80,6 @@ void notifyEvent(final CameraEvent event) {
 
     private final CameraManager mCameraManager;
 
-    private final HandlerThread mBackgroundThread = new HandlerThread("background");
-
     private final HandlerThread mSessionConfigurationThread = new HandlerThread("session-config");
 
     private final Handler mBackgroundHandler;
@@ -123,8 +122,7 @@ void notifyEvent(final CameraEvent event) {
                   final @NonNull String cameraId) throws CameraAccessException {
         mCameraId = cameraId;
         mCameraManager = (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
-        mBackgroundThread.start();
-        mBackgroundHandler = new Handler(mBackgroundThread.getLooper());
+        mBackgroundHandler = new Handler(Looper.getMainLooper());
         mSessionConfigurationThread.start();
         mSessionConfigurationHandler = new Handler(mSessionConfigurationThread.getLooper());
         mOptions = initOptions();
@@ -189,7 +187,6 @@ public boolean isRecording() {
 
     public synchronized void destroy() {
         close();
-        mBackgroundThread.quit();
         mSessionConfigurationThread.quit();
     }
 
@@ -691,7 +688,8 @@ private void onCaptureResult(final CaptureResult result, final boolean isComplet
                         Integer aeState = result.get(CaptureResult.CONTROL_AE_STATE);
                         mIsAeReady = aeState == null
                                 || aeState == CaptureResult.CONTROL_AE_STATE_CONVERGED
-                                || aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED;
+                                || aeState == CaptureRequest.CONTROL_AE_STATE_FLASH_REQUIRED
+                                || aeState == CaptureRequest.CONTROL_AE_STATE_PRECAPTURE;
                     }
                     mIsCaptureReady |= isCompleted;
                     if (DEBUG) {

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/camera/Camera2Recorder.java

@@ -55,6 +55,7 @@
 import java.util.List;
 import java.util.Locale;
 
+
 public class Camera2Recorder extends AbstractCamera2Recorder implements HostDevicePhotoRecorder, HostDeviceStreamRecorder {
 
     /**
@@ -532,18 +533,15 @@ private void registerVideo(final File videoFile) {
             values.put(MediaStore.Video.Media.ARTIST, "DeviceConnect");
             values.put(MediaStore.Video.Media.MIME_TYPE, "video/avc");
             values.put(MediaStore.Video.Media.DATA, videoFile.toString());
-            long thumbnailId = registerVideoThumbnail(videoFile);
-            if (thumbnailId > -1) {
-                values.put(MediaStore.Video.Media.MINI_THUMB_MAGIC, thumbnailId);
-            }
             Uri uri = resolver.insert(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values);
 
             // 動画IDをサムネイルDBに挿入.
             try {
-                if (uri != null && thumbnailId > -1) {
+                if (uri != null) {
                     String id = uri.getLastPathSegment();
                     if (id != null) {
                         long videoId = Long.parseLong(id);
+                        long thumbnailId = registerVideoThumbnail(videoFile, videoId);
                         boolean updated = updateThumbnailInfo(thumbnailId, videoId);
                         if (updated) {
                             if (DEBUG) {
@@ -569,7 +567,7 @@ private void registerVideo(final File videoFile) {
         }
     }
 
-    private long registerVideoThumbnail(final File videoFile) {
+    private long registerVideoThumbnail(final File videoFile, final long videoId) {
         String videoFilePath = videoFile.getAbsolutePath();
         final int kind = MediaStore.Images.Thumbnails.MINI_KIND;
         Bitmap thumbnail = ThumbnailUtils.createVideoThumbnail(videoFilePath, kind);
@@ -588,6 +586,7 @@ private long registerVideoThumbnail(final File videoFile) {
             values.put(MediaStore.Video.Thumbnails.WIDTH, thumbnail.getWidth());
             values.put(MediaStore.Video.Thumbnails.HEIGHT, thumbnail.getHeight());
             values.put(MediaStore.Video.Thumbnails.KIND, kind);
+            values.put(MediaStore.Video.Thumbnails.VIDEO_ID, videoId);
             ContentResolver resolver = getContext().getApplicationContext().getContentResolver();
             Uri uri = resolver.insert(MediaStore.Video.Thumbnails.EXTERNAL_CONTENT_URI, values);
             if (uri == null) {