Merge commit 'd3b1ec44d49366cff9ecb8449b4a214871f53ad2' into modify_livestreaming_screen

Author: TakayukiHoshi1984

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

@@ -551,6 +551,9 @@ public synchronized void stopRecording() throws CameraWrapperException {
         close();
         if (mIsPreview) {
             startPreview(mPreviewSurface, true);
+        } else if (mIsTouchOn) {
+            mIsTouchOn = false;
+            turnOnTorch();
         }
         notifyCameraEvent(CameraEvent.STOPPED_VIDEO_RECORDING);
     }
@@ -623,17 +626,21 @@ public void onCaptureBufferLost(@NonNull CameraCaptureSession session, @NonNull
             }
             resumeRepeatingRequest();
             throw new CameraWrapperException(e);
+        } finally {
+            mIsTakingStillImage = false;
         }
     }
 
     private void resumeRepeatingRequest() {
-        mIsTakingStillImage = false;
 
         try {
             if (mIsRecording) {
                 startRecording(mRecordingSurface, true);
             } else if (mIsPreview) {
                 startPreview(mPreviewSurface, true);
+            } else if (mIsTouchOn) {
+                mIsTouchOn = false;
+                turnOnTorch();
             } else {
                 close();
             }
@@ -794,7 +801,12 @@ public synchronized void turnOnTorch(final @Nullable TorchOnListener listener,
                 if (mTargetSurface != null) {
                     requestBuilder.addTarget(mTargetSurface);
                 }
-            } else {
+            }
+            if (mIsRecording) {
+                requestBuilder.addTarget(mRecordingSurface);
+            }
+
+            if (!mIsPreview && !mIsRecording) {
                 requestBuilder.addTarget(mDummyPreviewReader.getSurface());
             }
             requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
@@ -848,6 +860,8 @@ public synchronized void turnOffTorch(final @Nullable TorchOffListener listener,
                 throw new IllegalArgumentException(e);
             } catch (CameraWrapperException e) {
                 throw new IllegalArgumentException(e);
+            } finally {
+                resumeRepeatingRequest();
             }
             notifyTorchOffEvent(listener, handler);
         }

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/profile/HostMediaStreamingRecordingProfile.java

@@ -696,7 +696,8 @@ public boolean onRequest(final Intent request, final Intent response) {
                 return true;
             }
 
-            if (recorder.getState() != HostMediaRecorder.RecorderState.INACTIVE) {
+            if (recorder.getState() != HostMediaRecorder.RecorderState.INACTIVE
+                && recorder.getState() != HostMediaRecorder.RecorderState.PREVIEW) {
                 MessageUtils.setIllegalDeviceStateError(response,
                         recorder.getName() + " is already running.");
                 return true;

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/recorder/util/LiveStreamingClient.java

@@ -55,7 +55,7 @@ public void setVideoEncoder(final @NonNull VideoEncoder videoEncoder, Integer wi
                 videoQuality.setVideoHeight(height);
             }
             if (bitrate != null) {
-                videoQuality.setBitRate(bitrate);
+                videoQuality.setBitRate(bitrate * 1024);
             }
             if (frameRate != null) {
                 videoQuality.setFrameRate(frameRate);

dConnectDevicePlugin/dConnectDeviceUVC/app/src/main/java/org/deviceconnect/android/deviceplugin/uvc/UVCDeviceService.java

@@ -78,9 +78,11 @@ public void onDestroy() {
                 ((UVCService) service).closeUVCDevice();
             }
         }
-        mDeviceMgr.removeDeviceListener(mDeviceListener);
-        mDeviceMgr.removeConnectionListener(mConnectionListener);
-        mDeviceMgr.stop();
+        if (mDeviceMgr != null) {
+            mDeviceMgr.removeDeviceListener(mDeviceListener);
+            mDeviceMgr.removeConnectionListener(mConnectionListener);
+            mDeviceMgr.stop();
+        }
         unregisterReceiver(mPermissionReceiver);
         super.onDestroy();
     }