commit a3e136be581ee59b78aae8165ac54aacbfbbf369
author gitbuildkicker <android-build@google.com> Sun Feb 05 00:08:24 2017 -0800
committer gitbuildkicker <android-build@google.com> Sun Feb 05 00:08:24 2017 -0800
tree fc763247efe90f96af30627541ed3b48ad8726c5
parent 9f5d6c9700a09a8a926cbb7bc6a6c5a645e3ec2a
parent 53e63469c1ea15e4dadfcebcfc15d8aafe1eb4e6

merge in nyc-mr2-release history after reset to nyc-mr2-dev

camera/QCamera2/HAL3/QCamera3HWI.cpp

diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp
index cb5d3ff..75a82ab 100644
--- a/camera/QCamera2/HAL3/QCamera3HWI.cpp
+++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp
@@ -9488,7 +9488,9 @@
     for (List<stream_info_t *>::iterator it = mStreamInfo.begin();
         it != mStreamInfo.end(); it++) {
         QCamera3Channel *channel = (QCamera3Channel *)(*it)->stream->priv;
-        channel->stop();
+        if (channel != nullptr) {
+            channel->stop();
+        }
         (*it)->status = INVALID;
     }
 

init.angler.usb.rc

diff --git a/init.angler.usb.rc b/init.angler.usb.rc
index f2edba9..90ad8e8 100644
--- a/init.angler.usb.rc
+++ b/init.angler.usb.rc
@@ -21,6 +21,7 @@
     write /sys/class/android_usb/android0/iSerial ${ro.serialno}
     write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
     write /sys/class/android_usb/android0/iProduct ${ro.product.model}
+    write /sys/module/dwc3/boot_finished 1
 
 on post-fs
     mkdir /dev/usb-ffs 0770 shell shell