commit fe7f565eb1b5b5810e52e3f4ef0b55606ccb1953
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 11 01:34:57 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 11 01:34:57 2021 +0000
tree b4636f7d16e0c4241c4c5b77fbdc2160dbed3e97
parent 22169cf4290927da1dc88fcc712625f8fb8247e6
parent a7981f92e6fcb022bb716981c944f46ce255b694

Merge "Returns a default ExtensionsManager even if something went wrong when initializing the vendor library" into androidx-main

camera/camera-extensions/src/main/java/androidx/camera/extensions/ExtensionsManager.java

diff --git a/camera/camera-extensions/src/main/java/androidx/camera/extensions/ExtensionsManager.java b/camera/camera-extensions/src/main/java/androidx/camera/extensions/ExtensionsManager.java
index b231ccb..3e74c77 100644
--- a/camera/camera-extensions/src/main/java/androidx/camera/extensions/ExtensionsManager.java
+++ b/camera/camera-extensions/src/main/java/androidx/camera/extensions/ExtensionsManager.java
@@ -178,6 +178,15 @@
                                 + "are missed in the vendor library. " + e);
                         completer.set(getOrCreateExtensionsManager(
                                 ExtensionsAvailability.LIBRARY_UNAVAILABLE_MISSING_IMPLEMENTATION));
+                    } catch (RuntimeException e) {
+                        // Catches all unexpected runtime exceptions and still returns an
+                        // ExtensionsManager instance which performs default behavior.
+                        Logger.e(TAG,
+                                "Failed to initialize extensions. Something wents wrong when "
+                                        + "initializing the vendor library. "
+                                        + e);
+                        completer.set(getOrCreateExtensionsManager(
+                                ExtensionsAvailability.LIBRARY_UNAVAILABLE_ERROR_LOADING));
                     }
 
                     return "Initialize extensions";