commit fb2b8eaf0c4bf980605030f3c66b44a097fa7950
author Eino-Ville Talvala <etalvala@google.com> Wed May 20 00:08:15 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 20 00:08:15 2015 +0000
tree 958a7af9fa6125b87635d95905012db3a3a08045
parent 8f9dd2c40b8ab996e71d6835c379a5d4a8551b00
parent 022f0cb0c6f135edde4ebe84859c685933ee895e

Merge "CameraService: Logcat conflicting devices on rejected open" into mnc-dev

services/camera/libcameraservice/CameraService.cpp

diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index a971928..82aa566 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/camera/libcameraservice/CameraService.cpp
@@ -959,6 +959,10 @@
                         "(PID %" PRId32 ", priority %" PRId32 ")", i->getKey().string(),
                         String8{i->getValue()->getPackageName()}.string(), i->getOwnerId(),
                         i->getPriority());
+                ALOGE("   Conflicts with: Device %s, client package %s (PID %"
+                        PRId32 ", priority %" PRId32 ")", i->getKey().string(),
+                        String8{i->getValue()->getPackageName()}.string(), i->getOwnerId(),
+                        i->getPriority());
             }
 
             // Log the client's attempt