From 022f0cb0c6f135edde4ebe84859c685933ee895e Mon Sep 17 00:00:00 2001 From: Eino-Ville Talvala Date: Tue, 19 May 2015 16:31:16 -0700 Subject: CameraService: Logcat conflicting devices on rejected open Already in dumpsys log, but also put into logcat for feedback reports Also fix a minor warning about an uninitialized variable. Bug: 21063372 Change-Id: I04b45932e4500ac72aaa1cb724abc8a82a0e70e8 --- services/camera/libcameraservice/CameraService.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'services/camera/libcameraservice') diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index fc9a332..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 @@ -1975,7 +1979,7 @@ String8 CameraService::CameraClientManager::toString() const { auto conflicting = i->getConflicting(); auto clientSp = i->getValue(); String8 packageName; - userid_t clientUserId; + userid_t clientUserId = 0; if (clientSp.get() != nullptr) { packageName = String8{clientSp->getPackageName()}; uid_t clientUid = clientSp->getClientUid(); -- cgit v1.1