saki4510t · rwrnet · Feb 16, 2019
diff --git a/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java b/libuvccamera/src/main/java/com/serenegiant/usb/USBMonitor.java
@@ -70,6 +70,7 @@ public final class USBMonitor {
 	private final WeakReference<Context> mWeakContext;
 	private final UsbManager mUsbManager;
 	private final OnDeviceConnectListener mOnDeviceConnectListener;
+	private UsbDevice connectionInProgressDevice = null;
 	private PendingIntent mPermissionIntent = null;
 	private List<DeviceFilter> mDeviceFilters = new ArrayList<DeviceFilter>();
 
@@ -169,7 +170,7 @@ public synchronized void register() throws IllegalStateException {
 			if (context != null) {
 				mPermissionIntent = PendingIntent.getBroadcast(context, 0, new Intent(ACTION_USB_PERMISSION), 0);
 				final IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION);
-				// ACTION_USB_DEVICE_ATTACHED never comes on some devices so it should not be added here
+				filter.addAction(UsbManager.ACTION_USB_DEVICE_ATTACHED);
 				filter.addAction(UsbManager.ACTION_USB_DEVICE_DETACHED);
 				context.registerReceiver(mUsbReceiver, filter);
 			}
@@ -488,6 +489,16 @@ public void onReceive(final Context context, final Intent intent) {
 				}
 			} else if (UsbManager.ACTION_USB_DEVICE_ATTACHED.equals(action)) {
 				final UsbDevice device = intent.getParcelableExtra(UsbManager.EXTRA_DEVICE);
+				if(
+					connectionInProgressDevice != null &&
+					connectionInProgressDevice.getVendorId() == device.getVendorId() &&
+					connectionInProgressDevice.getProductId() == device.getProductId() &&
+					connectionInProgressDevice.getDeviceClass() == device.getDeviceClass() &&
+					connectionInProgressDevice.getDeviceSubclass() == device.getDeviceSubclass()
+				){
+					// probably our last connection was interrupted by kernel detaching a v4l mount, try immediate reconnect
+					requestPermission(device);
+				}
 				updatePermission(device, hasPermission(device));
 				processAttach(device);
 			} else if (UsbManager.ACTION_USB_DEVICE_DETACHED.equals(action)) {
@@ -551,6 +562,7 @@ public void run() {
 	 */
 	private final void processConnect(final UsbDevice device) {
 		if (destroyed) return;
+		connectionInProgressDevice = device;
 		updatePermission(device, true);
 		mAsyncHandler.post(new Runnable() {
 			@Override
@@ -566,7 +578,8 @@ public void run() {
 				} else {
 					createNew = false;
 				}
-				if (mOnDeviceConnectListener != null) {
+				if (mOnDeviceConnectListener != null && ctrlBlock.getConnection() != null) {
+					connectionInProgressDevice = null;
 					mOnDeviceConnectListener.onConnect(device, ctrlBlock, createNew);
 				}
 			}
@@ -882,6 +895,7 @@ public static UsbDeviceInfo getDeviceInfo(final Context context, final UsbDevice
 	 * @param _info
 	 * @return
 	 */
+	@SuppressLint("NewApi")
 	public static UsbDeviceInfo updateDeviceInfo(final UsbManager manager, final UsbDevice device, final UsbDeviceInfo _info) {
 		final UsbDeviceInfo info = _info != null ? _info : new UsbDeviceInfo();
 		info.clear();
@@ -897,6 +911,7 @@ public static UsbDeviceInfo updateDeviceInfo(final UsbManager manager, final Usb
 			}
 			if ((manager != null) && manager.hasPermission(device)) {
 				final UsbDeviceConnection connection = manager.openDevice(device);
+				if(connection == null) return info; // return what we have without a connection
 				final byte[] desc = connection.getRawDescriptors();
 
 				if (TextUtils.isEmpty(info.usb_version)) {
@@ -1228,6 +1243,7 @@ public synchronized UsbInterface getInterface(final int interface_id) throws Ill
 		 * @return
 		 * @throws IllegalStateException
 		 */
+		@SuppressLint("NewApi")
 		public synchronized UsbInterface getInterface(final int interface_id, final int altsetting) throws IllegalStateException {
 			checkConnection();
 			SparseArray<UsbInterface> intfs = mInterfaces.get(interface_id);

diff --git a/usbCameraTest/src/main/AndroidManifest.xml b/usbCameraTest/src/main/AndroidManifest.xml
@@ -28,14 +28,25 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest.MainActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+<!--uncomment to get permanent USB Permission
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
+            </intent-filter>
+            <meta-data
+                android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
+                android:resource="@xml/device_filter" />
+-->
         </activity>
     </application>
 

diff --git a/usbCameraTest/src/main/res/layout/activity_main.xml b/usbCameraTest/src/main/res/layout/activity_main.xml
@@ -33,8 +33,7 @@
         android:id="@+id/UVCCameraTextureView1"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:background="#ff000000" />
+        android:layout_gravity="center" />
 
     <ImageButton
         android:id="@+id/camera_button"

diff --git a/usbCameraTest0/src/main/AndroidManifest.xml b/usbCameraTest0/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest0.MainActivity"
             android:label="@string/app_name" >

diff --git a/usbCameraTest2/src/main/AndroidManifest.xml b/usbCameraTest2/src/main/AndroidManifest.xml
@@ -30,7 +30,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest2.MainActivity"
             android:label="@string/app_name" >

diff --git a/usbCameraTest3/src/main/AndroidManifest.xml b/usbCameraTest3/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest3.MainActivity"
             android:screenOrientation="sensorLandscape"

diff --git a/usbCameraTest4/src/main/AndroidManifest.xml b/usbCameraTest4/src/main/AndroidManifest.xml
@@ -27,6 +27,7 @@
 
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
 
@@ -35,7 +36,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
@@ -65,4 +66,4 @@
 		</service>
 	</application>
 
-</manifest>
+</manifest>
diff --git a/usbCameraTest4/src/main/java/com/serenegiant/service/UVCService.java b/usbCameraTest4/src/main/java/com/serenegiant/service/UVCService.java
@@ -23,6 +23,10 @@
 
 package com.serenegiant.service;
 
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.support.v4.app.NotificationCompat;
+import android.app.NotificationChannel;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -40,6 +44,7 @@
 import com.serenegiant.usb.USBMonitor.UsbControlBlock;
 import com.serenegiant.usbcameratest4.MainActivity;
 import com.serenegiant.usbcameratest4.R;
+import com.serenegiant.utils.BuildCheck;
 
 public class UVCService extends BaseService {
 	private static final boolean DEBUG = true;
@@ -111,6 +116,17 @@ public boolean onUnbind(final Intent intent) {
 		return true;
 	}
 
+	@TargetApi(26)
+	private synchronized String createChannel() {
+		String channelId = "usbCameraTest4Service";
+		NotificationChannel mChannel = new NotificationChannel(channelId, "UsbCameraTest4 Service", NotificationManager.IMPORTANCE_LOW);
+		if (mNotificationManager != null) {
+		  mNotificationManager.createNotificationChannel(mChannel);
+		} else {
+		  stopSelf();
+		}
+		return channelId;
+	}
 //********************************************************************************
 	/**
 	 * helper method to show/change message on notification area
@@ -119,8 +135,14 @@ public boolean onUnbind(final Intent intent) {
 	 */
 	private void showNotification(final CharSequence text) {
 		if (DEBUG) Log.v(TAG, "showNotification:" + text);
-        // Set the info for the views that show in the notification panel.
-        final Notification notification = new Notification.Builder(this)
+	  String channelId = "";
+	  // If earlier version channel ID is not used
+	  // https://developer.android.com/reference/android/support/v4/app/NotificationCompat.Builder.html#NotificationCompat.Builder(android.content.Context)
+	  if (BuildCheck.isAndroid8()) {
+	    channelId = createChannel();
+	  }
+	  // Set the info for the views that show in the notification panel.
+	  final Notification notification = new NotificationCompat.Builder(this, channelId)
 			.setSmallIcon(R.drawable.ic_launcher)  // the status icon
 			.setTicker(text)  // the status text
 			.setWhen(System.currentTimeMillis())  // the time stamp
@@ -132,7 +154,7 @@ private void showNotification(final CharSequence text) {
 		startForeground(NOTIFICATION, notification);
         // Send the notification.
 		mNotificationManager.notify(NOTIFICATION, notification);
-    }
+  }
 
 	private final OnDeviceConnectListener mOnDeviceConnectListener = new OnDeviceConnectListener() {
 		@Override

diff --git a/usbCameraTest5/src/main/AndroidManifest.xml b/usbCameraTest5/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest5.MainActivity"
             android:label="@string/app_name" >

diff --git a/usbCameraTest6/src/main/AndroidManifest.xml b/usbCameraTest6/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest6.MainActivity"
             android:label="@string/app_name"

diff --git a/usbCameraTest7/src/main/AndroidManifest.xml b/usbCameraTest7/src/main/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/Theme.AppCompat" >
         <activity
             android:name="com.serenegiant.usbcameratest7.MainActivity"
             android:label="@string/app_name"

diff --git a/usbCameraTest8/src/main/AndroidManifest.xml b/usbCameraTest8/src/main/AndroidManifest.xml
@@ -34,7 +34,7 @@
 		android:icon="@mipmap/ic_launcher"
 		android:label="@string/app_name"
 		android:supportsRtl="true"
-		android:theme="@style/AppTheme">
+		android:theme="@style/Theme.AppCompat">
 		<activity
 			android:name=".MainActivity"
 			android:screenOrientation="sensorLandscape"
@@ -47,4 +47,4 @@
 		</activity>
 	</application>
 
-</manifest>
+</manifest>