diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-05-20 00:08:15 +0000 | 
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-20 00:08:15 +0000 | 
| commit | fb2b8eaf0c4bf980605030f3c66b44a097fa7950 (patch) | |
| tree | 958a7af9fa6125b87635d95905012db3a3a08045 /services/camera | |
| parent | 8f9dd2c40b8ab996e71d6835c379a5d4a8551b00 (diff) | |
| parent | 022f0cb0c6f135edde4ebe84859c685933ee895e (diff) | |
| download | frameworks_av-fb2b8eaf0c4bf980605030f3c66b44a097fa7950.zip frameworks_av-fb2b8eaf0c4bf980605030f3c66b44a097fa7950.tar.gz frameworks_av-fb2b8eaf0c4bf980605030f3c66b44a097fa7950.tar.bz2  | |
Merge "CameraService: Logcat conflicting devices on rejected open" into mnc-dev
Diffstat (limited to 'services/camera')
| -rw-r--r-- | services/camera/libcameraservice/CameraService.cpp | 4 | 
1 files changed, 4 insertions, 0 deletions
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 @@ status_t CameraService::handleEvictionsLocked(const String8& cameraId, int clien                          "(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  | 
